diff --git a/chatterbox.yyp b/chatterbox.yyp index 73f46eff..af532584 100644 --- a/chatterbox.yyp +++ b/chatterbox.yyp @@ -1,599 +1,88 @@ { - "id": "f80915f5-85cc-47ff-bd21-f708e703dca2", - "modelName": "GMProject", - "mvc": "1.0", - "IsDnDProject": false, - "configs": [ - - ], - "option_ecma": false, - "parentProject": { - "id": "a7fcecc5-314b-4674-b0fa-9a7b89510a8f", - "modelName": "GMProjectParent", - "mvc": "1.0", - "alteredResources": [ - { - "Key": "ed6a955d-5826-4f98-a450-10b414266c27", - "Value": { - "configDeltas": [ - "inherited" - ], - "id": "565b9855-d914-48c4-b9dc-82e10dc164d2", - "resourcePath": "options\\main\\options_main.yy", - "resourceType": "GMMainOptions" - } - } - ], - "hiddenResources": [ - - ], - "projectPath": "${base_project}" - }, - "resources": [ - { - "Key": "013729a3-ac01-4ec9-ae9f-defcd9f03fd6", - "Value": { - "id": "bfdaeba9-26bf-4ba0-8ab3-659245b28409", - "resourcePath": "views\\013729a3-ac01-4ec9-ae9f-defcd9f03fd6.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "0728437b-b2e3-4875-bbba-74bc28b777b0", - "Value": { - "id": "d74971c5-75b1-45f6-b969-2426b9081864", - "resourcePath": "scripts\\__chatterbox_error\\__chatterbox_error.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "0983f652-6ae8-4dd0-b1df-11881acb290e", - "Value": { - "id": "a9052d48-7523-437f-a0e1-597cc264b99d", - "resourcePath": "views\\0983f652-6ae8-4dd0-b1df-11881acb290e.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "0bd17290-248f-4321-ab5a-f82c01bc2fbf", - "Value": { - "id": "0745eae0-cff5-4d40-8a92-9cbe8106fa22", - "resourcePath": "views\\0bd17290-248f-4321-ab5a-f82c01bc2fbf.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "15c3b5bf-0954-44f0-825f-43431206085c", - "Value": { - "id": "4ee59432-8393-4ed2-aa1c-b88968cf992b", - "resourcePath": "scripts\\chatterbox_body_count\\chatterbox_body_count.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "1b8a0e6b-905e-4f98-85d3-5b11498b4042", - "Value": { - "id": "ab30b8d0-72ff-4ec5-b0c2-45d953e05255", - "resourcePath": "views\\1b8a0e6b-905e-4f98-85d3-5b11498b4042.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "1c424e6a-baa6-493c-be83-daf99575559b", - "Value": { - "id": "907366f0-33ed-4731-94ce-2799747a26d9", - "resourcePath": "scripts\\__chatterbox_array_to_string\\__chatterbox_array_to_string.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "211c822a-303c-4c26-ad78-e2435f3a28a2", - "Value": { - "id": "aaf7d80a-09fb-4c45-831d-91d1f38033b7", - "resourcePath": "scripts\\__chatterbox_tokenize_action\\__chatterbox_tokenize_action.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "25021e7e-8142-4fbb-8f3f-aeefd5d03271", - "Value": { - "id": "8099805f-8424-42f0-ae48-237f812b9a83", - "resourcePath": "scripts\\__chatterbox_syntax\\__chatterbox_syntax.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "2b5b6d64-5f87-44f3-8400-534c8e1cc91c", - "Value": { - "id": "e17e95e3-b8bf-40ec-93e7-edde41d0af83", - "resourcePath": "views\\2b5b6d64-5f87-44f3-8400-534c8e1cc91c.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "36f2c371-0af7-4281-bef1-c48ce4fbbb54", - "Value": { - "id": "666752ac-f982-4629-969c-542257aa9859", - "resourcePath": "scripts\\chatterbox_create_host\\chatterbox_create_host.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "3a479606-3abc-4c0a-ba65-b8a104c61c52", - "Value": { - "id": "2cdd511b-4766-4599-9ac5-8e48dcf7e855", - "resourcePath": "views\\3a479606-3abc-4c0a-ba65-b8a104c61c52.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "3a5af38c-757d-41ae-98c0-5d4b09e14e6a", - "Value": { - "id": "5d25c3e7-4b7f-44e6-af1f-4c2ddba141c0", - "resourcePath": "options\\switch\\options_switch.yy", - "resourceType": "GMSwitchOptions" - } - }, - { - "Key": "3a5af38c-757d-44ae-98c0-5d4b09e14e6a", - "Value": { - "id": "d27a44bd-3ab8-4668-8171-f48658784bf6", - "resourcePath": "options\\ps4\\options_ps4.yy", - "resourceType": "GMPS4Options" - } - }, - { - "Key": "3a73c356-b790-4ff3-9dde-6790b01ef8b2", - "Value": { - "id": "a0680903-5004-4687-b6f3-3c8d19fd22b9", - "resourcePath": "scripts\\chatterbox_option_get\\chatterbox_option_get.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "426a5290-5eb6-446f-be10-7e9300c94750", - "Value": { - "id": "bab002fa-07d8-447a-b92c-ecd8cb0f9164", - "resourcePath": "views\\426a5290-5eb6-446f-be10-7e9300c94750.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "43355a1d-c927-4976-8b8c-ec643f1db781", - "Value": { - "id": "a9b48c37-e0a6-45c8-86aa-41c5d6caaa1e", - "resourcePath": "scripts\\chatterbox_body_get\\chatterbox_body_get.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "48de0644-428c-4f83-84dc-d8f4ed174f63", - "Value": { - "id": "f4be7778-d50e-42c0-831f-be9b3eecc7ce", - "resourcePath": "scripts\\chatterbox_init_add_json\\chatterbox_init_add_json.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "5035acc2-d809-4bf5-b251-ea72c52874d4", - "Value": { - "id": "02a7e685-e9b7-4ca2-aa6e-db0838d3d3a7", - "resourcePath": "scripts\\suspend_dialogue\\suspend_dialogue.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "503cf607-27a8-45bf-a70c-c4f6011d4644", - "Value": { - "id": "2e664e4e-8780-406d-a7c5-9db63c8ff808", - "resourcePath": "views\\503cf607-27a8-45bf-a70c-c4f6011d4644.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "511b43eb-944f-4793-a978-5172325a27b0", - "Value": { - "id": "bf50386b-d3d3-4372-ba3c-a83238eb41ff", - "resourcePath": "scripts\\__chatterbox_trace\\__chatterbox_trace.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "5a2bd88b-bb45-42ce-b065-697aa4e45e60", - "Value": { - "id": "18cbf52a-a901-405d-af93-d929197a4c15", - "resourcePath": "scripts\\__chatterbox_evaluate\\__chatterbox_evaluate.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "5dbb4614-c49b-4056-8ef0-5531f8ec6484", - "Value": { - "id": "2700399b-e22d-46ba-aa23-1f44226d9207", - "resourcePath": "datafiles_yy\\Yarn\\Test2.yarn.yy", - "resourceType": "GMIncludedFile" - } - }, - { - "Key": "5f87550b-7fb8-44c6-b07e-5cd3c4197c31", - "Value": { - "id": "244a3f26-f5b6-460d-8319-1a09772016e4", - "resourcePath": "views\\5f87550b-7fb8-44c6-b07e-5cd3c4197c31.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "60990149-1dae-4f22-88d9-53025cbd7878", - "Value": { - "id": "f11aa36b-1f1e-4a5a-bae5-6e41da881c44", - "resourcePath": "scripts\\__chatterbox_resolve_value\\__chatterbox_resolve_value.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "6a735733-e38d-4fc8-ad9e-24d8b97c6adb", - "Value": { - "id": "310012e9-0630-447c-91ce-3c51cce03a8e", - "resourcePath": "scripts\\chatterbox_init_add_findreplace\\chatterbox_init_add_findreplace.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "6ea95fbf-928f-40c7-b8cf-3569b68beb05", - "Value": { - "id": "6be618c4-8aeb-43ff-af6e-03f3522d3863", - "resourcePath": "objects\\oSuspendExample\\oSuspendExample.yy", - "resourceType": "GMObject" - } - }, - { - "Key": "6f508094-c871-48eb-a955-07e2b6794dac", - "Value": { - "id": "c3e764d0-bd68-4ec7-960c-8034d03d7157", - "resourcePath": "datafiles_yy\\Yarn\\Test.json.yy", - "resourceType": "GMIncludedFile" - } - }, - { - "Key": "7078f18e-cab5-4718-9cff-70420fb20d03", - "Value": { - "id": "ddbc6eff-7b3d-4bf8-a313-a5f7a732e716", - "resourcePath": "scripts\\chatterbox_init_end\\chatterbox_init_end.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "73d76eff-c580-4c7f-8a7a-50753795d711", - "Value": { - "id": "559e402a-c64c-4409-9612-507c72f5be72", - "resourcePath": "views\\73d76eff-c580-4c7f-8a7a-50753795d711.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "75ac291e-7061-4bcb-8e8a-3b3545332d41", - "Value": { - "id": "1185de35-caa5-43a2-88ff-c70beddd982e", - "resourcePath": "options\\html5\\options_html5.yy", - "resourceType": "GMHtml5Options" - } - }, - { - "Key": "7887bc75-4b33-4846-bd70-275cf18456f4", - "Value": { - "id": "452211be-1520-4453-a4e4-3f29703f9c97", - "resourcePath": "rooms\\rExample\\rExample.yy", - "resourceType": "GMRoom" - } - }, - { - "Key": "7e093a2a-e51c-4a1e-9a53-f9080d38730b", - "Value": { - "id": "1439cfbd-9724-4b91-a4b2-06abb2487f60", - "resourcePath": "options\\windowsuap\\options_windowsuap.yy", - "resourceType": "GMWindowsUAPOptions" - } - }, - { - "Key": "7ed6fdb0-1cb3-4158-9bd0-c37474248cac", - "Value": { - "id": "052cbb2c-c946-49b4-a63b-aa58a4b14e2b", - "resourcePath": "scripts\\chatterbox_option_count\\chatterbox_option_count.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "8427047f-9ef8-4c77-89f3-9c20623d07b6", - "Value": { - "id": "7bba32a6-49dc-4bc9-92e3-c33d7186dafe", - "resourcePath": "options\\ios\\options_ios.yy", - "resourceType": "GMiOSOptions" - } - }, - { - "Key": "84f15521-954c-4d2d-9709-5b2d9ca231f1", - "Value": { - "id": "6d90fb91-fe64-4260-ab7e-1528569c3379", - "resourcePath": "views\\84f15521-954c-4d2d-9709-5b2d9ca231f1.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "872012ae-b0bc-44c4-bc46-bf0e03659e62", - "Value": { - "id": "05f894b8-2586-4dff-99b4-a35ca47bcf4f", - "resourcePath": "scripts\\chatterbox_init_add_function\\chatterbox_init_add_function.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "881dd845-b97a-4dce-a3fe-1ad4ded0084f", - "Value": { - "id": "29a9d6be-86a3-49f3-99a1-2a8b7d45c026", - "resourcePath": "scripts\\chatterbox_select\\chatterbox_select.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "8af41d37-ecf9-419b-baf8-12de7445f9cf", - "Value": { - "id": "b2af99e0-571a-490f-8aa9-c58f64a0712c", - "resourcePath": "views\\8af41d37-ecf9-419b-baf8-12de7445f9cf.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "8e242548-7b78-464a-bb38-54a74acce8a4", - "Value": { - "id": "36a43528-e79d-4dd1-b5e2-7f6839e31430", - "resourcePath": "rooms\\rInit\\rInit.yy", - "resourceType": "GMRoom" - } - }, - { - "Key": "8f58bbbe-3dba-44de-b201-00643bc3496c", - "Value": { - "id": "e179358f-4862-4635-a37d-92551f8bac2c", - "resourcePath": "objects\\oBeginnerExample\\oBeginnerExample.yy", - "resourceType": "GMObject" - } - }, - { - "Key": "93566aad-c3b3-48a9-8fa7-9c5ee19f74ac", - "Value": { - "id": "ce465774-50bd-4c53-b87d-384690a5423f", - "resourcePath": "options\\tvos\\options_tvos.yy", - "resourceType": "GMtvOSOptions" - } - }, - { - "Key": "946479bd-e52d-41cb-994f-9184d806b8b5", - "Value": { - "id": "42472f94-8ec7-488a-bdeb-1e502bc60846", - "resourcePath": "views\\946479bd-e52d-41cb-994f-9184d806b8b5.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "9a14b894-4693-4a4a-a152-7ede094c183a", - "Value": { - "id": "81c9abcf-8081-4d51-a544-be7cac5bf2de", - "resourcePath": "views\\9a14b894-4693-4a4a-a152-7ede094c183a.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "9ac119d1-18d4-4e8d-b6fe-3a55f9192a0b", - "Value": { - "id": "d8515e41-8a17-4e82-9539-7ee95f77249b", - "resourcePath": "scripts\\chatterbox_goto\\chatterbox_goto.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "a128950b-5063-4876-b4a6-b99dbd2ea6d1", - "Value": { - "id": "4cac3a81-fd9d-4338-9deb-fbfc2f10a361", - "resourcePath": "options\\amazonfire\\options_amazonfire.yy", - "resourceType": "GMAmazonFireOptions" - } - }, - { - "Key": "a9188620-a624-4a5a-83ae-a1b53faf038b", - "Value": { - "id": "90c740c6-2b0d-4907-a395-8f3afe4fa4ad", - "resourcePath": "options\\linux\\options_linux.yy", - "resourceType": "GMLinuxOptions" - } - }, - { - "Key": "a9c1c006-82cc-4168-94cf-cda9593ef14e", - "Value": { - "id": "b7f2f356-4008-4e35-bc1c-b9f950d1d9c3", - "resourcePath": "views\\a9c1c006-82cc-4168-94cf-cda9593ef14e.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "b1d302c2-0fa0-4efb-8e77-0aa33c500be6", - "Value": { - "id": "c82b71e2-a66c-43a9-a7c4-597472cf21f2", - "resourcePath": "views\\b1d302c2-0fa0-4efb-8e77-0aa33c500be6.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "c459431b-207e-415b-b3a7-92d0d49053d1", - "Value": { - "id": "63678702-206e-457b-8663-7692fe299513", - "resourcePath": "views\\c459431b-207e-415b-b3a7-92d0d49053d1.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "ca6010de-78da-4d2d-a06c-d8021e067eab", - "Value": { - "id": "3392542a-84b1-4aa7-b24b-33ca58939698", - "resourcePath": "scripts\\__chatterbox_config\\__chatterbox_config.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "cc98d028-7bdd-4680-85f3-c87a7baa481e", - "Value": { - "id": "a4a671e8-7a67-41ec-aeac-662bfabcc64b", - "resourcePath": "options\\windows\\options_windows.yy", - "resourceType": "GMWindowsOptions" - } - }, - { - "Key": "d25ff5fc-73bc-48eb-ad5c-e3a6cb63937e", - "Value": { - "id": "783aa4a9-4159-4f86-a98a-173f517bfbc6", - "resourcePath": "scripts\\chatterbox_init_add_action\\chatterbox_init_add_action.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "d31795bd-3e13-4c6b-bec6-ccf6cfdf0bce", - "Value": { - "id": "897c9eeb-3a61-4efe-bf6f-c17ad23d001f", - "resourcePath": "views\\d31795bd-3e13-4c6b-bec6-ccf6cfdf0bce.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "df3afc9f-820f-420b-b9b5-ed2c2222c392", - "Value": { - "id": "4e6bbd92-0545-493c-bfc4-2cd9d9d3b297", - "resourcePath": "views\\df3afc9f-820f-420b-b9b5-ed2c2222c392.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "e42bf5cc-3f46-4d67-a6d0-a4885a11ac3f", - "Value": { - "id": "d2eb849c-77fa-4177-82b4-59dfadb486eb", - "resourcePath": "options\\android\\options_android.yy", - "resourceType": "GMAndroidOptions" - } - }, - { - "Key": "e7f86093-cebc-4ca5-ac72-b9e0a305ba95", - "Value": { - "id": "d8621315-20a6-44e4-a3a9-c6c3aa6982f2", - "resourcePath": "datafiles_yy\\Yarn\\Test2.json.yy", - "resourceType": "GMIncludedFile" - } - }, - { - "Key": "e808db90-cb59-47eb-bd8f-ff2d1072801a", - "Value": { - "id": "8c46608e-ca03-4b02-8d57-cac2238ae396", - "resourcePath": "scripts\\__chatterbox_string\\__chatterbox_string.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "f0d55121-d1e8-45b8-ac57-b1a98bfb38a3", - "Value": { - "id": "c47dcb8f-443f-4a21-81c1-5242e2b48a5a", - "resourcePath": "objects\\oInit\\oInit.yy", - "resourceType": "GMObject" - } - }, - { - "Key": "f15d55bc-151d-4270-b176-8a9a3e0115da", - "Value": { - "id": "717852e5-4781-441b-9f0f-11ffbcfa366d", - "resourcePath": "scripts\\chatterbox_init_add_yarn\\chatterbox_init_add_yarn.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "f418569b-3bdd-4706-a0e4-364317f54032", - "Value": { - "id": "f0cb9727-2298-4848-9f10-5fabdd8d25b9", - "resourcePath": "options\\mac\\options_mac.yy", - "resourceType": "GMMacOptions" - } - }, - { - "Key": "f7061cd5-abb7-47d5-9afb-0c61c4101a56", - "Value": { - "id": "2cf9ea98-0a31-46de-bc35-000e59428035", - "resourcePath": "scripts\\__chatterbox_remove_whitespace\\__chatterbox_remove_whitespace.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "f81a5ff9-7863-41a8-8186-a48a0e804b89", - "Value": { - "id": "6b06a2c8-e72e-40e2-9d19-084695c4656c", - "resourcePath": "views\\f81a5ff9-7863-41a8-8186-a48a0e804b89.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "f85efd3d-bcec-4ec0-8226-da808afda79d", - "Value": { - "id": "0bb686da-a957-4402-a81f-27e500f05cf6", - "resourcePath": "options\\xboxone\\options_xboxone.yy", - "resourceType": "GMXBoxOneOptions" - } - }, - { - "Key": "f86819ac-c627-4fd4-95a4-0e87a325a6ff", - "Value": { - "id": "b13bb939-d2c8-4d06-b135-734b3f3ac81a", - "resourcePath": "views\\f86819ac-c627-4fd4-95a4-0e87a325a6ff.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "fb0ac65c-2f27-415b-806a-ba3ed448100d", - "Value": { - "id": "cb917961-7a2d-4453-86cd-90343fb869c0", - "resourcePath": "scripts\\__chatterbox_new_instruction\\__chatterbox_new_instruction.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "ffc75b87-7243-4a9b-8f82-a7aec1b436ba", - "Value": { - "id": "30b84997-6b5c-4017-813c-18c0e609825d", - "resourcePath": "scripts\\chatterbox_init_start\\chatterbox_init_start.yy", - "resourceType": "GMScript" - } - } - ], - "script_order": [ - "ca6010de-78da-4d2d-a06c-d8021e067eab", - "25021e7e-8142-4fbb-8f3f-aeefd5d03271", - "ffc75b87-7243-4a9b-8f82-a7aec1b436ba", - "48de0644-428c-4f83-84dc-d8f4ed174f63", - "f15d55bc-151d-4270-b176-8a9a3e0115da", - "7078f18e-cab5-4718-9cff-70420fb20d03", - "36f2c371-0af7-4281-bef1-c48ce4fbbb54", - "d25ff5fc-73bc-48eb-ad5c-e3a6cb63937e", - "872012ae-b0bc-44c4-bc46-bf0e03659e62", - "6a735733-e38d-4fc8-ad9e-24d8b97c6adb", - "9ac119d1-18d4-4e8d-b6fe-3a55f9192a0b", - "881dd845-b97a-4dce-a3fe-1ad4ded0084f", - "43355a1d-c927-4976-8b8c-ec643f1db781", - "15c3b5bf-0954-44f0-825f-43431206085c", - "3a73c356-b790-4ff3-9dde-6790b01ef8b2", - "7ed6fdb0-1cb3-4158-9bd0-c37474248cac", - "f7061cd5-abb7-47d5-9afb-0c61c4101a56", - "60990149-1dae-4f22-88d9-53025cbd7878", - "5a2bd88b-bb45-42ce-b065-697aa4e45e60", - "511b43eb-944f-4793-a978-5172325a27b0", - "0728437b-b2e3-4875-bbba-74bc28b777b0", - "1c424e6a-baa6-493c-be83-daf99575559b", - "e808db90-cb59-47eb-bd8f-ff2d1072801a", - "fb0ac65c-2f27-415b-806a-ba3ed448100d", - "211c822a-303c-4c26-ad78-e2435f3a28a2", - "5035acc2-d809-4bf5-b251-ea72c52874d4" - ], - "tutorial": "" + "resources": [ + {"id":{"name":"__chatterbox_config","path":"scripts/__chatterbox_config/__chatterbox_config.yy",},"order":0,}, + {"id":{"name":"__chatterbox_syntax","path":"scripts/__chatterbox_syntax/__chatterbox_syntax.yy",},"order":1,}, + {"id":{"name":"chatterbox_init_start","path":"scripts/chatterbox_init_start/chatterbox_init_start.yy",},"order":0,}, + {"id":{"name":"chatterbox_init_add_json","path":"scripts/chatterbox_init_add_json/chatterbox_init_add_json.yy",},"order":1,}, + {"id":{"name":"chatterbox_init_add_yarn","path":"scripts/chatterbox_init_add_yarn/chatterbox_init_add_yarn.yy",},"order":2,}, + {"id":{"name":"chatterbox_init_end","path":"scripts/chatterbox_init_end/chatterbox_init_end.yy",},"order":3,}, + {"id":{"name":"chatterbox_create_host","path":"scripts/chatterbox_create_host/chatterbox_create_host.yy",},"order":4,}, + {"id":{"name":"chatterbox_init_add_action","path":"scripts/chatterbox_init_add_action/chatterbox_init_add_action.yy",},"order":0,}, + {"id":{"name":"chatterbox_init_add_function","path":"scripts/chatterbox_init_add_function/chatterbox_init_add_function.yy",},"order":1,}, + {"id":{"name":"chatterbox_init_add_findreplace","path":"scripts/chatterbox_init_add_findreplace/chatterbox_init_add_findreplace.yy",},"order":2,}, + {"id":{"name":"chatterbox_goto","path":"scripts/chatterbox_goto/chatterbox_goto.yy",},"order":3,}, + {"id":{"name":"chatterbox_select","path":"scripts/chatterbox_select/chatterbox_select.yy",},"order":4,}, + {"id":{"name":"chatterbox_body_get","path":"scripts/chatterbox_body_get/chatterbox_body_get.yy",},"order":5,}, + {"id":{"name":"chatterbox_body_count","path":"scripts/chatterbox_body_count/chatterbox_body_count.yy",},"order":6,}, + {"id":{"name":"chatterbox_option_get","path":"scripts/chatterbox_option_get/chatterbox_option_get.yy",},"order":7,}, + {"id":{"name":"chatterbox_option_count","path":"scripts/chatterbox_option_count/chatterbox_option_count.yy",},"order":8,}, + {"id":{"name":"__chatterbox_remove_whitespace","path":"scripts/__chatterbox_remove_whitespace/__chatterbox_remove_whitespace.yy",},"order":0,}, + {"id":{"name":"__chatterbox_resolve_value","path":"scripts/__chatterbox_resolve_value/__chatterbox_resolve_value.yy",},"order":1,}, + {"id":{"name":"__chatterbox_evaluate","path":"scripts/__chatterbox_evaluate/__chatterbox_evaluate.yy",},"order":2,}, + {"id":{"name":"__chatterbox_trace","path":"scripts/__chatterbox_trace/__chatterbox_trace.yy",},"order":3,}, + {"id":{"name":"__chatterbox_error","path":"scripts/__chatterbox_error/__chatterbox_error.yy",},"order":4,}, + {"id":{"name":"__chatterbox_array_to_string","path":"scripts/__chatterbox_array_to_string/__chatterbox_array_to_string.yy",},"order":5,}, + {"id":{"name":"__chatterbox_string","path":"scripts/__chatterbox_string/__chatterbox_string.yy",},"order":6,}, + {"id":{"name":"__chatterbox_new_instruction","path":"scripts/__chatterbox_new_instruction/__chatterbox_new_instruction.yy",},"order":7,}, + {"id":{"name":"__chatterbox_tokenize_action","path":"scripts/__chatterbox_tokenize_action/__chatterbox_tokenize_action.yy",},"order":8,}, + {"id":{"name":"suspend_dialogue","path":"scripts/suspend_dialogue/suspend_dialogue.yy",},"order":1,}, + {"id":{"name":"oInit","path":"objects/oInit/oInit.yy",},"order":0,}, + {"id":{"name":"oBeginnerExample","path":"objects/oBeginnerExample/oBeginnerExample.yy",},"order":1,}, + {"id":{"name":"oSuspendExample","path":"objects/oSuspendExample/oSuspendExample.yy",},"order":2,}, + {"id":{"name":"rInit","path":"rooms/rInit/rInit.yy",},"order":0,}, + {"id":{"name":"rExample","path":"rooms/rExample/rExample.yy",},"order":1,}, + ], + "Options": [ + {"name":"Switch","path":"options/switch/options_switch.yy",}, + {"name":"HTML5","path":"options/html5/options_html5.yy",}, + {"name":"PlayStation 4","path":"options/ps4/options_ps4.yy",}, + {"name":"tvOS","path":"options/tvos/options_tvos.yy",}, + {"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":"macOS","path":"options/mac/options_mac.yy",}, + {"name":"Android","path":"options/android/options_android.yy",}, + {"name":"Main","path":"options/main/options_main.yy",}, + ], + "isDnDProject": false, + "isEcma": false, + "tutorialPath": "", + "configs": { + "name": "Default", + "children": [], + }, + "RoomOrder": [ + {"name":"rInit","path":"rooms/rInit/rInit.yy",}, + {"name":"rExample","path":"rooms/rExample/rExample.yy",}, + ], + "Folders": [ + {"folderPath":"folders/Scripts.yy","order":0,"resourceVersion":"1.0","name":"Scripts","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Scripts/Chatterbox.yy","order":0,"resourceVersion":"1.0","name":"Chatterbox","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Scripts/Chatterbox/Setup.yy","order":2,"resourceVersion":"1.0","name":"Setup","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Scripts/Chatterbox/Setup/Extra.yy","order":5,"resourceVersion":"1.0","name":"Extra","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Scripts/Chatterbox/__Private.yy","order":9,"resourceVersion":"1.0","name":"__Private","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Objects.yy","order":1,"resourceVersion":"1.0","name":"Objects","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Rooms.yy","order":2,"resourceVersion":"1.0","name":"Rooms","tags":[],"resourceType":"GMFolder",}, + ], + "AudioGroups": [ + {"targets":461609314234257646,"resourceVersion":"1.0","name":"audiogroup_default","resourceType":"GMAudioGroup",}, + ], + "TextureGroups": [ + {"isScaled":false,"autocrop":true,"border":2,"mipsToGenerate":0,"targets":461609314234257646,"resourceVersion":"1.0","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",}, + ], + "MetaData": { + "IDEVersion": "23.1.1.169", + }, + "resourceVersion": "1.3", + "name": "chatterbox", + "tags": [], + "resourceType": "GMProject", } \ No newline at end of file diff --git a/datafiles_yy/Test2.json.yy b/datafiles_yy/Test2.json.yy deleted file mode 100644 index be74d5a7..00000000 --- a/datafiles_yy/Test2.json.yy +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "e7f86093-cebc-4ca5-ac72-b9e0a305ba95", - "modelName": "GMIncludedFile", - "mvc": "1.0", - "name": "Test2.json", - "CopyToMask": -1, - "exists": false, - "exportAction": 0, - "exportDir": "", - "fileName": "Test2.json", - "filePath": "datafiles", - "freeData": false, - "origName": "", - "overwrite": false, - "removeEnd": false, - "size": 0, - "store": false, - "tags": "" -} \ No newline at end of file diff --git a/datafiles_yy/Yarn/Test.json.yy b/datafiles_yy/Yarn/Test.json.yy deleted file mode 100644 index c3a8ac5f..00000000 --- a/datafiles_yy/Yarn/Test.json.yy +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "6f508094-c871-48eb-a955-07e2b6794dac", - "modelName": "GMIncludedFile", - "mvc": "1.0", - "name": "Test.json", - "CopyToMask": -1, - "exists": false, - "exportAction": 0, - "exportDir": "", - "fileName": "Test.json", - "filePath": "datafiles\\Yarn", - "freeData": false, - "origName": "", - "overwrite": false, - "removeEnd": false, - "size": 0, - "store": false, - "tags": "" -} \ No newline at end of file diff --git a/datafiles_yy/Yarn/Test2.json.yy b/datafiles_yy/Yarn/Test2.json.yy deleted file mode 100644 index cb664bed..00000000 --- a/datafiles_yy/Yarn/Test2.json.yy +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "e7f86093-cebc-4ca5-ac72-b9e0a305ba95", - "modelName": "GMIncludedFile", - "mvc": "1.0", - "name": "Test2.json", - "CopyToMask": -1, - "exists": false, - "exportAction": 0, - "exportDir": "", - "fileName": "Test2.json", - "filePath": "datafiles\\Yarn", - "freeData": false, - "origName": "", - "overwrite": false, - "removeEnd": false, - "size": 0, - "store": false, - "tags": "" -} \ No newline at end of file diff --git a/datafiles_yy/Yarn/Test2.yarn.yy b/datafiles_yy/Yarn/Test2.yarn.yy deleted file mode 100644 index fdac2f09..00000000 --- a/datafiles_yy/Yarn/Test2.yarn.yy +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "5dbb4614-c49b-4056-8ef0-5531f8ec6484", - "modelName": "GMIncludedFile", - "mvc": "1.0", - "name": "Test2.yarn", - "CopyToMask": -1, - "exists": false, - "exportAction": 0, - "exportDir": "", - "fileName": "Test2.yarn", - "filePath": "datafiles\\Yarn", - "freeData": false, - "origName": "", - "overwrite": false, - "removeEnd": false, - "size": 0, - "store": false, - "tags": "" -} \ No newline at end of file diff --git a/datafiles_yy/fTestB.yy.yy b/datafiles_yy/fTestB.yy.yy deleted file mode 100644 index 483a6657..00000000 --- a/datafiles_yy/fTestB.yy.yy +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "84f6b7ba-9a5a-4882-8ab1-0f577bbb590f", - "modelName": "GMIncludedFile", - "mvc": "1.0", - "name": "fTestB.yy", - "CopyToMask": -1, - "exists": false, - "exportAction": 0, - "exportDir": "", - "fileName": "fTestB.yy", - "filePath": "datafiles", - "freeData": false, - "origName": "", - "overwrite": false, - "removeEnd": false, - "size": 0, - "store": false, - "tags": "" -} \ No newline at end of file diff --git a/file.yarn.txt b/file.yarn.txt deleted file mode 100644 index d86e68ae..00000000 --- a/file.yarn.txt +++ /dev/null @@ -1,117 +0,0 @@ -title: Start -tags: Test1, Test2, Test3 -colorID: 0 -position: 534,350 ---- - -<><>This is the starting node. - -Calling visited("Start") should return True now, since we have visited this node. - -<> - Called visited("Start") and confirmed that we've visited Start! -<> - -Calling visited("Node4") should return False, because we haven't been there yet. - -<> - Our validation is broken! Oh no! -<> - -<> - -A variable named "variable1" is now set to True, and the debug log should reflect this. - -We are auto-advancing to the next node, "Node1". - -[[Node1]] - -=== -title: Node1 -tags: Test2, Test3, Test4 -colorID: 0 -position: 856,356 ---- - - -In this node, we make a choice, using quick choice syntax, and set a variable based off of that. This line is long, too, so it helps us with testing text wrapping. - --> Choice 1 - <> --> Choice 2 - <> - -Based off of which choice has been selected, variable "variable2" will be either 1 or 2. - -Now we use an if statement to check it. - -<> - You chose Choice 1! -<> -<> - You chose Choice 2! -<> -<> - We failed to set the variable! -<> - -We have successfully checked a variable. - -The next node will use standard choice syntax. - -[[Node2]] - - -=== -title: Node2 -tags: -colorID: 0 -position: 1131,400 ---- - - -Standard choice syntax test. - -[[Choice 1|Node3]] -[[Choice 2|Node4]] -=== -title: Node3 -tags: -colorID: 0 -position: 1371,230 ---- -<> - -[[Node5]] - - -=== -title: Node4 -tags: -colorID: 0 -position: 1424,555 ---- - - -[[Node5]] - - -=== -title: Node5 -tags: -colorID: 0 -position: 1699,293 ---- - - -<> - You chose Choice 1 earlier! -<> -<> - You chose Choice 2 earlier! -<> - -This is the end of the Yarn testing file. - - -=== diff --git a/objects/oBeginnerExample/oBeginnerExample.yy b/objects/oBeginnerExample/oBeginnerExample.yy index a21d06b3..65835ef6 100644 --- a/objects/oBeginnerExample/oBeginnerExample.yy +++ b/objects/oBeginnerExample/oBeginnerExample.yy @@ -1,58 +1,35 @@ { - "id": "8f58bbbe-3dba-44de-b201-00643bc3496c", - "modelName": "GMObject", - "mvc": "1.0", - "name": "oBeginnerExample", - "eventList": [ - { - "id": "84e10638-cb79-4344-97fb-bf94c5157a8e", - "modelName": "GMEvent", - "mvc": "1.0", - "IsDnD": false, - "collisionObjectId": "00000000-0000-0000-0000-000000000000", - "enumb": 0, - "eventtype": 0, - "m_owner": "8f58bbbe-3dba-44de-b201-00643bc3496c" - }, - { - "id": "c1872af6-6bfc-412d-a964-3892b1aa5121", - "modelName": "GMEvent", - "mvc": "1.0", - "IsDnD": false, - "collisionObjectId": "00000000-0000-0000-0000-000000000000", - "enumb": 0, - "eventtype": 3, - "m_owner": "8f58bbbe-3dba-44de-b201-00643bc3496c" - }, - { - "id": "026c6943-26d6-41f9-b970-3992c0ad0345", - "modelName": "GMEvent", - "mvc": "1.0", - "IsDnD": false, - "collisionObjectId": "00000000-0000-0000-0000-000000000000", - "enumb": 0, - "eventtype": 8, - "m_owner": "8f58bbbe-3dba-44de-b201-00643bc3496c" - } - ], - "maskSpriteId": "00000000-0000-0000-0000-000000000000", - "overriddenProperties": null, - "parentObjectId": "00000000-0000-0000-0000-000000000000", - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 0, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": null, - "physicsStartAwake": true, - "properties": null, - "solid": false, - "spriteId": "00000000-0000-0000-0000-000000000000", - "visible": true + "spriteId": null, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 0, + "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":"oBeginnerExample","path":"objects/oBeginnerExample/oBeginnerExample.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oBeginnerExample","path":"objects/oBeginnerExample/oBeginnerExample.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oBeginnerExample","path":"objects/oBeginnerExample/oBeginnerExample.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "resourceVersion": "1.0", + "name": "oBeginnerExample", + "tags": [], + "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/oInit/oInit.yy b/objects/oInit/oInit.yy index 0ceee167..62c0d7b2 100644 --- a/objects/oInit/oInit.yy +++ b/objects/oInit/oInit.yy @@ -1,38 +1,33 @@ { - "id": "f0d55121-d1e8-45b8-ac57-b1a98bfb38a3", - "modelName": "GMObject", - "mvc": "1.0", - "name": "oInit", - "eventList": [ - { - "id": "d6509f97-729f-4c1c-a5f5-04cad8ba5e29", - "modelName": "GMEvent", - "mvc": "1.0", - "IsDnD": false, - "collisionObjectId": "00000000-0000-0000-0000-000000000000", - "enumb": 0, - "eventtype": 0, - "m_owner": "f0d55121-d1e8-45b8-ac57-b1a98bfb38a3" - } - ], - "maskSpriteId": "00000000-0000-0000-0000-000000000000", - "overriddenProperties": null, - "parentObjectId": "00000000-0000-0000-0000-000000000000", - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 0, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": null, - "physicsStartAwake": true, - "properties": null, - "solid": false, - "spriteId": "00000000-0000-0000-0000-000000000000", - "visible": true + "spriteId": null, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 0, + "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":"oInit","path":"objects/oInit/oInit.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "resourceVersion": "1.0", + "name": "oInit", + "tags": [], + "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/oSuspendExample/oSuspendExample.yy b/objects/oSuspendExample/oSuspendExample.yy index d67ba529..655a13a5 100644 --- a/objects/oSuspendExample/oSuspendExample.yy +++ b/objects/oSuspendExample/oSuspendExample.yy @@ -1,58 +1,35 @@ { - "id": "6ea95fbf-928f-40c7-b8cf-3569b68beb05", - "modelName": "GMObject", - "mvc": "1.0", - "name": "oSuspendExample", - "eventList": [ - { - "id": "cdd2ff5a-203e-44b0-9de3-6cce795490e3", - "modelName": "GMEvent", - "mvc": "1.0", - "IsDnD": false, - "collisionObjectId": "00000000-0000-0000-0000-000000000000", - "enumb": 0, - "eventtype": 0, - "m_owner": "6ea95fbf-928f-40c7-b8cf-3569b68beb05" - }, - { - "id": "0dd3bfbb-9c71-44a3-a39d-da4f6c4584be", - "modelName": "GMEvent", - "mvc": "1.0", - "IsDnD": false, - "collisionObjectId": "00000000-0000-0000-0000-000000000000", - "enumb": 0, - "eventtype": 3, - "m_owner": "6ea95fbf-928f-40c7-b8cf-3569b68beb05" - }, - { - "id": "fb9b04b9-715d-43de-ba03-9f0c87821dcc", - "modelName": "GMEvent", - "mvc": "1.0", - "IsDnD": false, - "collisionObjectId": "00000000-0000-0000-0000-000000000000", - "enumb": 0, - "eventtype": 8, - "m_owner": "6ea95fbf-928f-40c7-b8cf-3569b68beb05" - } - ], - "maskSpriteId": "00000000-0000-0000-0000-000000000000", - "overriddenProperties": null, - "parentObjectId": "00000000-0000-0000-0000-000000000000", - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 0, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": null, - "physicsStartAwake": true, - "properties": null, - "solid": false, - "spriteId": "00000000-0000-0000-0000-000000000000", - "visible": true + "spriteId": null, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 0, + "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":"oSuspendExample","path":"objects/oSuspendExample/oSuspendExample.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oSuspendExample","path":"objects/oSuspendExample/oSuspendExample.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oSuspendExample","path":"objects/oSuspendExample/oSuspendExample.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "resourceVersion": "1.0", + "name": "oSuspendExample", + "tags": [], + "resourceType": "GMObject", } \ No newline at end of file diff --git a/options/amazonfire/options_amazonfire.yy b/options/amazonfire/options_amazonfire.yy index d3c67d57..4a7034d4 100644 --- a/options/amazonfire/options_amazonfire.yy +++ b/options/amazonfire/options_amazonfire.yy @@ -1,51 +1,49 @@ { - "id": "a128950b-5063-4876-b4a6-b99dbd2ea6d1", - "modelName": "GMAmazonFireOptions", - "mvc": "1.0", - "name": "Amazon Fire", - "option_amazonfire_build_tools": "23.0.1", - "option_amazonfire_compile_sdk": "23", - "option_amazonfire_display_name": "Made in GameMaker Studio 2", - "option_amazonfire_gamepad_support": true, - "option_amazonfire_icon_hdpi": "${base_options_dir}\\amazonfire\\icons\\hdpi.png", - "option_amazonfire_icon_ldpi": "${base_options_dir}\\amazonfire\\icons\\ldpi.png", - "option_amazonfire_icon_mdpi": "${base_options_dir}\\amazonfire\\icons\\mdpi.png", - "option_amazonfire_icon_xhdpi": "${base_options_dir}\\amazonfire\\icons\\xhdpi.png", - "option_amazonfire_icon_xxhdpi": "${base_options_dir}\\amazonfire\\icons\\xxhdpi.png", - "option_amazonfire_icon_xxxhdpi": "${base_options_dir}\\amazonfire\\icons\\xxxhdpi.png", - "option_amazonfire_install_location": 0, - "option_amazonfire_interpolate_pixels": false, - "option_amazonfire_lint": false, - "option_amazonfire_minimum_sdk": "9", - "option_amazonfire_moga_support": false, - "option_amazonfire_orient_landscape": true, - "option_amazonfire_orient_landscape_flipped": true, - "option_amazonfire_orient_portrait": true, - "option_amazonfire_orient_portrait_flipped": true, - "option_amazonfire_package_company": "company", - "option_amazonfire_package_domain": "com", - "option_amazonfire_package_product": "game", - "option_amazonfire_permission_bluetooth": false, - "option_amazonfire_permission_internet": true, - "option_amazonfire_permission_network_state": false, - "option_amazonfire_permission_read_phone_state": false, - "option_amazonfire_permission_record_audio": false, - "option_amazonfire_permission_write_external_storage": false, - "option_amazonfire_scale": 0, - "option_amazonfire_screen_depth": 0, - "option_amazonfire_sleep_margin": 4, - "option_amazonfire_splash_screens_landscape": "${base_options_dir}\\amazonfire\\splash\\landscape.png", - "option_amazonfire_splash_screens_portrait": "${base_options_dir}\\amazonfire\\splash\\portrait.png", - "option_amazonfire_splash_time": 0, - "option_amazonfire_support_lib": "23.1.1", - "option_amazonfire_sync_android": false, - "option_amazonfire_target_sdk": "23", - "option_amazonfire_texture_page": "2048x2048", - "option_amazonfire_tools_from_version": false, - "option_amazonfire_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - } + "option_amazonfire_sync_android": false, + "option_amazonfire_display_name": "Made in GameMaker Studio 2", + "option_amazonfire_version": "1.0.0.0", + "option_amazonfire_tools_from_version": false, + "option_amazonfire_build_tools": "23.0.1", + "option_amazonfire_support_lib": "23.1.1", + "option_amazonfire_target_sdk": "23", + "option_amazonfire_minimum_sdk": "9", + "option_amazonfire_compile_sdk": "23", + "option_amazonfire_package_domain": "com", + "option_amazonfire_package_company": "company", + "option_amazonfire_package_product": "game", + "option_amazonfire_orient_portrait": true, + "option_amazonfire_orient_portrait_flipped": true, + "option_amazonfire_orient_landscape": true, + "option_amazonfire_orient_landscape_flipped": true, + "option_amazonfire_gamepad_support": true, + "option_amazonfire_lint": false, + "option_amazonfire_install_location": 0, + "option_amazonfire_sleep_margin": 4, + "option_amazonfire_splash_screens_landscape": "${base_options_dir}\\amazonfire\\splash\\landscape.png", + "option_amazonfire_splash_screens_portrait": "${base_options_dir}\\amazonfire\\splash\\portrait.png", + "option_amazonfire_splash_time": 0, + "option_amazonfire_launchscreen_fill": 0, + "option_amazonfire_splashscreen_background_colour": 4294967295, + "option_amazonfire_tv_banner": "${base_options_dir}\\android\\tv_banner.png", + "option_amazonfire_interpolate_pixels": false, + "option_amazonfire_screen_depth": 0, + "option_amazonfire_scale": 0, + "option_amazonfire_texture_page": "2048x2048", + "option_amazonfire_icon_ldpi": "${base_options_dir}\\amazonfire\\icons\\ldpi.png", + "option_amazonfire_icon_mdpi": "${base_options_dir}\\amazonfire\\icons\\mdpi.png", + "option_amazonfire_icon_hdpi": "${base_options_dir}\\amazonfire\\icons\\hdpi.png", + "option_amazonfire_icon_xhdpi": "${base_options_dir}\\amazonfire\\icons\\xhdpi.png", + "option_amazonfire_icon_xxhdpi": "${base_options_dir}\\amazonfire\\icons\\xxhdpi.png", + "option_amazonfire_icon_xxxhdpi": "${base_options_dir}\\amazonfire\\icons\\xxxhdpi.png", + "option_amazonfire_permission_write_external_storage": false, + "option_amazonfire_permission_read_phone_state": false, + "option_amazonfire_permission_network_state": false, + "option_amazonfire_permission_internet": true, + "option_amazonfire_permission_bluetooth": false, + "option_amazonfire_permission_record_audio": false, + "option_amazonfire_application_tag_inject": null, + "resourceVersion": "1.0", + "name": "Amazon Fire", + "tags": [], + "resourceType": "GMAmazonFireOptions", } \ No newline at end of file diff --git a/options/android/options_android.yy b/options/android/options_android.yy index f84fa106..274b029a 100644 --- a/options/android/options_android.yy +++ b/options/android/options_android.yy @@ -1,71 +1,75 @@ { - "id": "e42bf5cc-3f46-4d67-a6d0-a4885a11ac3f", - "modelName": "GMAndroidOptions", - "mvc": "1.0", - "name": "Android", - "option_android_arch_arm64": false, - "option_android_arch_armv5": true, - "option_android_arch_armv7": true, - "option_android_arch_mips": false, - "option_android_arch_x86": false, - "option_android_arch_x86_64": false, - "option_android_build_tools": "23.0.1", - "option_android_compile_sdk": "23", - "option_android_device_support": 0, - "option_android_display_name": "Made in GameMaker Studio 2", - "option_android_facebook_app_display_name": "", - "option_android_facebook_id": "", - "option_android_gamepad_support": true, - "option_android_gcm_sender_id": "", - "option_android_google_apk_expansion": false, - "option_android_google_cloud_saving": false, - "option_android_google_enable_licensing": false, - "option_android_google_licensing_public_key": "", - "option_android_google_services": false, - "option_android_google_services_app_id": "", - "option_android_icon_hdpi": "${base_options_dir}\/android\/icons\/hdpi.png", - "option_android_icon_ldpi": "${base_options_dir}\/android\/icons\/ldpi.png", - "option_android_icon_mdpi": "${base_options_dir}\/android\/icons\/mdpi.png", - "option_android_icon_xhdpi": "${base_options_dir}\/android\/icons\/xhdpi.png", - "option_android_icon_xxhdpi": "${base_options_dir}\/android\/icons\/xxhdpi.png", - "option_android_icon_xxxhdpi": "${base_options_dir}\/android\/icons\/xxxhdpi.png", - "option_android_install_location": 0, - "option_android_interpolate_pixels": false, - "option_android_lint": false, - "option_android_minimum_sdk": "9", - "option_android_moga_support": false, - "option_android_orient_landscape": true, - "option_android_orient_landscape_flipped": true, - "option_android_orient_portrait": true, - "option_android_orient_portrait_flipped": true, - "option_android_package_company": "company", - "option_android_package_domain": "com", - "option_android_package_product": "game", - "option_android_permission_bluetooth": false, - "option_android_permission_internet": true, - "option_android_permission_network_state": false, - "option_android_permission_read_phone_state": false, - "option_android_permission_record_audio": false, - "option_android_permission_write_external_storage": false, - "option_android_push_notifications": false, - "option_android_scale": 0, - "option_android_screen_depth": 0, - "option_android_sleep_margin": 4, - "option_android_splash_screens_landscape": "${base_options_dir}\/android\/splash\/landscape.png", - "option_android_splash_screens_portrait": "${base_options_dir}\/android\/splash\/portrait.png", - "option_android_splash_time": 0, - "option_android_support_lib": "23.1.1", - "option_android_sync_amazon": false, - "option_android_target_sdk": "23", - "option_android_texture_page": "2048x2048", - "option_android_tools_from_version": false, - "option_android_tv_banner": "${base_options_dir}\\android\\tv_banner.png", - "option_android_tv_isgame": true, - "option_android_use_facebook": false, - "option_android_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - } + "option_android_sync_amazon": false, + "option_android_display_name": "Made in GameMaker Studio 2", + "option_android_version": "1.0.0.0", + "option_android_tools_from_version": false, + "option_android_build_tools": "23.0.1", + "option_android_support_lib": "23.1.1", + "option_android_target_sdk": "23", + "option_android_minimum_sdk": "9", + "option_android_compile_sdk": "23", + "option_android_package_domain": "com", + "option_android_package_company": "company", + "option_android_package_product": "game", + "option_android_arch_armv7": true, + "option_android_arch_x86": false, + "option_android_arch_arm64": false, + "option_android_arch_x86_64": false, + "option_android_orient_portrait": true, + "option_android_orient_portrait_flipped": true, + "option_android_orient_landscape": true, + "option_android_orient_landscape_flipped": true, + "option_android_gamepad_support": true, + "option_android_lint": false, + "option_android_install_location": 0, + "option_android_sleep_margin": 4, + "option_android_splash_screens_landscape": "${base_options_dir}/android/splash/landscape.png", + "option_android_splash_screens_portrait": "${base_options_dir}/android/splash/portrait.png", + "option_android_splash_time": 0, + "option_android_launchscreen_fill": 0, + "option_android_splashscreen_background_colour": 4294967295, + "option_android_tv_banner": "${base_options_dir}\\android\\tv_banner.png", + "option_android_interpolate_pixels": false, + "option_android_screen_depth": 0, + "option_android_device_support": 0, + "option_android_scale": 0, + "option_android_texture_page": "2048x2048", + "option_android_icon_ldpi": "${base_options_dir}/android/icons/ldpi.png", + "option_android_icon_mdpi": "${base_options_dir}/android/icons/mdpi.png", + "option_android_icon_hdpi": "${base_options_dir}/android/icons/hdpi.png", + "option_android_icon_xhdpi": "${base_options_dir}/android/icons/xhdpi.png", + "option_android_icon_xxhdpi": "${base_options_dir}/android/icons/xxhdpi.png", + "option_android_icon_xxxhdpi": "${base_options_dir}/android/icons/xxxhdpi.png", + "option_android_icon_adaptive_generate": false, + "option_android_icon_adaptive_ldpi": "${base_options_dir}\\android\\icons_adaptive\\ldpi.png", + "option_android_icon_adaptive_mdpi": "${base_options_dir}\\android\\icons_adaptive\\mdpi.png", + "option_android_icon_adaptive_hdpi": "${base_options_dir}\\android\\icons_adaptive\\hdpi.png", + "option_android_icon_adaptive_xhdpi": "${base_options_dir}\\android\\icons_adaptive\\xhdpi.png", + "option_android_icon_adaptive_xxhdpi": "${base_options_dir}\\android\\icons_adaptive\\xxhdpi.png", + "option_android_icon_adaptive_xxxhdpi": "${base_options_dir}\\android\\icons_adaptive\\xxxhdpi.png", + "option_android_icon_adaptivebg_ldpi": "${base_options_dir}\\android\\icons_adaptivebg\\ldpi.png", + "option_android_icon_adaptivebg_mdpi": "${base_options_dir}\\android\\icons_adaptivebg\\mdpi.png", + "option_android_icon_adaptivebg_hdpi": "${base_options_dir}\\android\\icons_adaptivebg\\hdpi.png", + "option_android_icon_adaptivebg_xhdpi": "${base_options_dir}\\android\\icons_adaptivebg\\xhdpi.png", + "option_android_icon_adaptivebg_xxhdpi": "${base_options_dir}\\android\\icons_adaptivebg\\xxhdpi.png", + "option_android_icon_adaptivebg_xxxhdpi": "${base_options_dir}\\android\\icons_adaptivebg\\xxxhdpi.png", + "option_android_use_facebook": false, + "option_android_facebook_id": "", + "option_android_facebook_app_display_name": "", + "option_android_google_cloud_saving": false, + "option_android_google_services_app_id": "", + "option_android_permission_write_external_storage": false, + "option_android_permission_read_phone_state": false, + "option_android_permission_network_state": false, + "option_android_permission_internet": true, + "option_android_permission_bluetooth": false, + "option_android_permission_record_audio": false, + "option_android_application_tag_inject": null, + "option_android_google_apk_expansion": false, + "option_android_google_licensing_public_key": "", + "option_android_tv_isgame": true, + "resourceVersion": "1.0", + "name": "Android", + "tags": [], + "resourceType": "GMAndroidOptions", } \ No newline at end of file diff --git a/options/html5/options_html5.yy b/options/html5/options_html5.yy index d9ef9826..8127449f 100644 --- a/options/html5/options_html5.yy +++ b/options/html5/options_html5.yy @@ -1,38 +1,34 @@ { - "id": "75ac291e-7061-4bcb-8e8a-3b3545332d41", - "modelName": "GMHtml5Options", - "mvc": "1.0", - "name": "HTML5", - "option_html5_allow_fullscreen": true, - "option_html5_browser_title": "Made in GameMaker Studio 2", - "option_html5_centregame": false, - "option_html5_display_cursor": true, - "option_html5_facebook_app_display_name": "", - "option_html5_facebook_id": "", - "option_html5_flurry_enable": false, - "option_html5_flurry_id": "", - "option_html5_foldername": "html5game", - "option_html5_google_analytics_enable": false, - "option_html5_google_tracking_id": "", - "option_html5_icon": "${base_options_dir}\/html5\/fav.ico", - "option_html5_index": "", - "option_html5_interpolate_pixels": false, - "option_html5_jsprepend": "", - "option_html5_loadingbar": "", - "option_html5_localrunalert": true, - "option_html5_outputdebugtoconsole": true, - "option_html5_outputname": "index.html", - "option_html5_scale": 0, - "option_html5_splash_png": "${base_options_dir}\/html5\/splash.png", - "option_html5_texture_page": "2048x2048", - "option_html5_use_facebook": false, - "option_html5_usebuiltinparticles": true, - "option_html5_usesplash": false, - "option_html5_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - }, - "option_html5_webgl": 2 + "option_html5_browser_title": "Made in GameMaker Studio 2", + "option_html5_version": "1.0.0.0", + "option_html5_foldername": "html5game", + "option_html5_outputname": "index.html", + "option_html5_splash_png": "${base_options_dir}/html5/splash.png", + "option_html5_usesplash": false, + "option_html5_outputdebugtoconsole": true, + "option_html5_display_cursor": true, + "option_html5_localrunalert": true, + "option_html5_index": "", + "option_html5_loadingbar": "", + "option_html5_jsprepend": "", + "option_html5_icon": "${base_options_dir}/html5/fav.ico", + "option_html5_allow_fullscreen": true, + "option_html5_interpolate_pixels": false, + "option_html5_centregame": false, + "option_html5_usebuiltinparticles": true, + "option_html5_usebuiltinfont": false, + "option_html5_webgl": 2, + "option_html5_scale": 0, + "option_html5_texture_page": "2048x2048", + "option_html5_use_facebook": false, + "option_html5_facebook_id": "", + "option_html5_facebook_app_display_name": "", + "option_html5_flurry_enable": false, + "option_html5_flurry_id": "", + "option_html5_google_analytics_enable": false, + "option_html5_google_tracking_id": "", + "resourceVersion": "1.0", + "name": "HTML5", + "tags": [], + "resourceType": "GMHtml5Options", } \ No newline at end of file diff --git a/options/ios/options_ios.yy b/options/ios/options_ios.yy index 990e10a6..ac99148a 100644 --- a/options/ios/options_ios.yy +++ b/options/ios/options_ios.yy @@ -1,74 +1,48 @@ { - "id": "8427047f-9ef8-4c77-89f3-9c20623d07b6", - "modelName": "GMiOSOptions", - "mvc": "1.0", - "name": "iOS", - "option_ios_bundle_name": "com.company.game", - "option_ios_defer_home_indicator": false, - "option_ios_devices": 2, - "option_ios_display_name": "Made in GameMaker Studio 2", - "option_ios_facebook_app_display_name": "", - "option_ios_facebook_id": "", - "option_ios_half_ipad1_textures": false, - "option_ios_icon_ipad_app_152": "${base_options_dir}\\ios\\icons\\app\\ipad_152.png", - "option_ios_icon_ipad_app_76": "${base_options_dir}\\ios\\icons\\app\\ipad_76.png", - "option_ios_icon_ipad_notification_20": "${base_options_dir}\\ios\\icons\\notification\\ipad_20.png", - "option_ios_icon_ipad_notification_40": "${base_options_dir}\\ios\\icons\\notification\\ipad_40.png", - "option_ios_icon_ipad_pro_app_167": "${base_options_dir}\\ios\\icons\\app\\ipad_pro_167.png", - "option_ios_icon_ipad_settings_29": "${base_options_dir}\\ios\\icons\\settings\\ipad_29.png", - "option_ios_icon_ipad_settings_58": "${base_options_dir}\\ios\\icons\\settings\\ipad_58.png", - "option_ios_icon_ipad_spotlight_40": "${base_options_dir}\\ios\\icons\\spotlight\\ipad_40.png", - "option_ios_icon_ipad_spotlight_80": "${base_options_dir}\\ios\\icons\\spotlight\\ipad_80.png", - "option_ios_icon_iphone_app_120": "${base_options_dir}\\ios\\icons\\app\\iphone_120.png", - "option_ios_icon_iphone_app_180": "${base_options_dir}\\ios\\icons\\app\\iphone_180.png", - "option_ios_icon_iphone_notification_40": "${base_options_dir}\\ios\\icons\\notification\\iphone_40.png", - "option_ios_icon_iphone_notification_60": "${base_options_dir}\\ios\\icons\\notification\\iphone_60.png", - "option_ios_icon_iphone_settings_58": "${base_options_dir}\\ios\\icons\\settings\\iphone_58.png", - "option_ios_icon_iphone_settings_87": "${base_options_dir}\\ios\\icons\\settings\\iphone_87.png", - "option_ios_icon_iphone_spotlight_120": "${base_options_dir}\\ios\\icons\\spotlight\\iphone_120.png", - "option_ios_icon_iphone_spotlight_80": "${base_options_dir}\\ios\\icons\\spotlight\\iphone_80.png", - "option_ios_icon_itunes_artwork_1024": "${base_options_dir}\\ios\\icons\\itunes\\itunes_1024.png", - "option_ios_interpolate_pixels": false, - "option_ios_orientation_landscape": true, - "option_ios_orientation_landscape_flipped": true, - "option_ios_orientation_portrait": true, - "option_ios_orientation_portrait_flipped": true, - "option_ios_output_dir": "~\/GameMakerStudio2\/iOS", - "option_ios_push_notifications": false, - "option_ios_scale": 0, - "option_ios_splashscreen_ipad_ios56_landscape": "${base_options_dir}\\ios\\splash\\ipad_landscape_1024x748.png", - "option_ios_splashscreen_ipad_ios56_portrait": "${base_options_dir}\\ios\\splash\\ipad_portrait_768x1004.png", - "option_ios_splashscreen_ipad_ios56_x2_landscape": "${base_options_dir}\\ios\\splash\\ipad_landscape_2048x1496.png", - "option_ios_splashscreen_ipad_ios56_x2_portrait": "${base_options_dir}\\ios\\splash\\ipad_portrait_1536x2008.png", - "option_ios_splashscreen_ipad_ios7_landscape": "${base_options_dir}\\ios\\splash\\ipad_7_landscape.png", - "option_ios_splashscreen_ipad_ios7_portrait": "${base_options_dir}\\ios\\splash\\ipad_7_portrait.png", - "option_ios_splashscreen_ipad_landscape": "${base_options_dir}\\ios\\splash\\ipad_landscape.png", - "option_ios_splashscreen_ipad_portrait": "${base_options_dir}\\ios\\splash\\ipad_portrait.png", - "option_ios_splashscreen_ipad_retina_ios7_landscape": "${base_options_dir}\\ios\\splash\\ipad_retina_7_landscape.png", - "option_ios_splashscreen_ipad_retina_ios7_portrait": "${base_options_dir}\\ios\\splash\\ipad_retina_7_portrait.png", - "option_ios_splashscreen_ipad_retina_landscape": "${base_options_dir}\\ios\\splash\\ipad_retina_landscape.png", - "option_ios_splashscreen_ipad_retina_portrait": "${base_options_dir}\\ios\\splash\\ipad_retina_portrait.png", - "option_ios_splashscreen_iphone_ios56_2x_portrait": "${base_options_dir}\\ios\\splash\\iphone_56_2x_portrait.png", - "option_ios_splashscreen_iphone_ios56_portrait": "${base_options_dir}\\ios\\splash\\iphone_56_portrait.png", - "option_ios_splashscreen_iphone_ios56_retina4_portrait": "${base_options_dir}\\ios\\splash\\iphone_56_retina4_portrait.png", - "option_ios_splashscreen_iphone_ios7_2x_portrait": "${base_options_dir}\\ios\\splash\\iphone_7_2x_portrait.png", - "option_ios_splashscreen_iphone_ios7_retina4_portrait": "${base_options_dir}\\ios\\splash\\iphone_7_retina4_portrait.png", - "option_ios_splashscreen_iphone_ios8_47_portrait": "${base_options_dir}\\ios\\splash\\iphone_8_47_portrait.png", - "option_ios_splashscreen_iphone_ios8_55_landscape": "${base_options_dir}\\ios\\splash\\iphone_8_55_landscape.png", - "option_ios_splashscreen_iphone_ios8_55_portrait": "${base_options_dir}\\ios\\splash\\iphone_8_55_portrait.png", - "option_ios_splashscreen_iphone_x_landscape": "${base_options_dir}\\ios\\splash\\iphone_x_landscape.png", - "option_ios_splashscreen_iphone_x_portrait": "${base_options_dir}\\ios\\splash\\iphone_x_portrait.png", - "option_ios_splashscreen_iphone_xr_landscape": "${base_options_dir}\\ios\\splash\\iphone_xr_landscape.png", - "option_ios_splashscreen_iphone_xr_portrait": "${base_options_dir}\\ios\\splash\\iphone_xr_portrait.png", - "option_ios_splashscreen_iphone_xs_max_landscape": "${base_options_dir}\\ios\\splash\\iphone_xs_max_landscape.png", - "option_ios_splashscreen_iphone_xs_max_portrait": "${base_options_dir}\\ios\\splash\\iphone_xs_max_portrait.png", - "option_ios_team_id": "", - "option_ios_texture_page": "2048x2048", - "option_ios_use_facebook": false, - "option_ios_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - } + "option_ios_display_name": "Made in GameMaker Studio 2", + "option_ios_bundle_name": "com.company.game", + "option_ios_version": "1.0.0.0", + "option_ios_output_dir": "~/GameMakerStudio2/iOS", + "option_ios_team_id": "", + "option_ios_orientation_portrait": true, + "option_ios_orientation_portrait_flipped": true, + "option_ios_orientation_landscape": true, + "option_ios_orientation_landscape_flipped": true, + "option_ios_devices": 2, + "option_ios_defer_home_indicator": false, + "option_ios_icon_iphone_app_120": "${base_options_dir}\\ios\\icons\\app\\iphone_120.png", + "option_ios_icon_iphone_app_180": "${base_options_dir}\\ios\\icons\\app\\iphone_180.png", + "option_ios_icon_ipad_app_76": "${base_options_dir}\\ios\\icons\\app\\ipad_76.png", + "option_ios_icon_ipad_app_152": "${base_options_dir}\\ios\\icons\\app\\ipad_152.png", + "option_ios_icon_ipad_pro_app_167": "${base_options_dir}\\ios\\icons\\app\\ipad_pro_167.png", + "option_ios_icon_iphone_notification_40": "${base_options_dir}\\ios\\icons\\notification\\iphone_40.png", + "option_ios_icon_iphone_notification_60": "${base_options_dir}\\ios\\icons\\notification\\iphone_60.png", + "option_ios_icon_ipad_notification_20": "${base_options_dir}\\ios\\icons\\notification\\ipad_20.png", + "option_ios_icon_ipad_notification_40": "${base_options_dir}\\ios\\icons\\notification\\ipad_40.png", + "option_ios_icon_iphone_spotlight_80": "${base_options_dir}\\ios\\icons\\spotlight\\iphone_80.png", + "option_ios_icon_iphone_spotlight_120": "${base_options_dir}\\ios\\icons\\spotlight\\iphone_120.png", + "option_ios_icon_ipad_spotlight_40": "${base_options_dir}\\ios\\icons\\spotlight\\ipad_40.png", + "option_ios_icon_ipad_spotlight_80": "${base_options_dir}\\ios\\icons\\spotlight\\ipad_80.png", + "option_ios_icon_iphone_settings_58": "${base_options_dir}\\ios\\icons\\settings\\iphone_58.png", + "option_ios_icon_iphone_settings_87": "${base_options_dir}\\ios\\icons\\settings\\iphone_87.png", + "option_ios_icon_ipad_settings_29": "${base_options_dir}\\ios\\icons\\settings\\ipad_29.png", + "option_ios_icon_ipad_settings_58": "${base_options_dir}\\ios\\icons\\settings\\ipad_58.png", + "option_ios_icon_itunes_artwork_1024": "${base_options_dir}\\ios\\icons\\itunes\\itunes_1024.png", + "option_ios_splashscreen_background_colour": 4294967295, + "option_ios_launchscreen_image": "${base_options_dir}\\ios\\splash\\launchscreen.png", + "option_ios_launchscreen_image_landscape": "${base_options_dir}\\ios\\splash\\launchscreen-landscape.png", + "option_ios_launchscreen_fill": 0, + "option_ios_interpolate_pixels": false, + "option_ios_half_ipad1_textures": false, + "option_ios_scale": 0, + "option_ios_texture_page": "2048x2048", + "option_ios_use_facebook": false, + "option_ios_facebook_id": "", + "option_ios_facebook_app_display_name": "", + "option_ios_push_notifications": false, + "option_ios_apple_sign_in": false, + "resourceVersion": "1.0", + "name": "iOS", + "tags": [], + "resourceType": "GMiOSOptions", } \ No newline at end of file diff --git a/options/linux/options_linux.yy b/options/linux/options_linux.yy index e5a8ac46..6cde6208 100644 --- a/options/linux/options_linux.yy +++ b/options/linux/options_linux.yy @@ -1,29 +1,25 @@ { - "id": "a9188620-a624-4a5a-83ae-a1b53faf038b", - "modelName": "GMLinuxOptions", - "mvc": "1.0", - "name": "Linux", - "option_linux_allow_fullscreen": false, - "option_linux_display_cursor": true, - "option_linux_display_name": "Made in GameMaker Studio 2", - "option_linux_display_splash": false, - "option_linux_enable_steam": false, - "option_linux_homepage": "http:\/\/www.yoyogames.com", - "option_linux_icon": "${base_options_dir}\/linux\/icons\/64.png", - "option_linux_interpolate_pixels": false, - "option_linux_long_desc": "", - "option_linux_maintainer_email": "", - "option_linux_resize_window": false, - "option_linux_scale": 0, - "option_linux_short_desc": "", - "option_linux_splash_screen": "${base_options_dir}\/linux\/splash\/splash.png", - "option_linux_start_fullscreen": false, - "option_linux_sync": false, - "option_linux_texture_page": "2048x2048", - "option_linux_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - } + "option_linux_display_name": "Made in GameMaker Studio 2", + "option_linux_version": "1.0.0.0", + "option_linux_maintainer_email": "", + "option_linux_homepage": "http://www.yoyogames.com", + "option_linux_short_desc": "", + "option_linux_long_desc": "", + "option_linux_splash_screen": "${base_options_dir}/linux/splash/splash.png", + "option_linux_display_splash": false, + "option_linux_icon": "${base_options_dir}/linux/icons/64.png", + "option_linux_start_fullscreen": false, + "option_linux_allow_fullscreen": false, + "option_linux_interpolate_pixels": false, + "option_linux_display_cursor": true, + "option_linux_sync": false, + "option_linux_resize_window": false, + "option_linux_scale": 0, + "option_linux_texture_page": "2048x2048", + "option_linux_enable_steam": false, + "option_linux_disable_sandbox": false, + "resourceVersion": "1.0", + "name": "Linux", + "tags": [], + "resourceType": "GMLinuxOptions", } \ No newline at end of file diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy index 73dad7c0..b8904f95 100644 --- a/options/mac/options_mac.yy +++ b/options/mac/options_mac.yy @@ -1,35 +1,32 @@ { - "id": "f418569b-3bdd-4706-a0e4-364317f54032", - "modelName": "GMMacOptions", - "mvc": "1.0", - "name": "macOS", - "option_mac_allow_fullscreen": false, - "option_mac_allow_incoming_network": false, - "option_mac_allow_outgoing_network": false, - "option_mac_app_category": "Games", - "option_mac_app_id": "com.company.game", - "option_mac_build_app_store": false, - "option_mac_copyright": "(c) 2018 CompanyName", - "option_mac_display_cursor": true, - "option_mac_display_name": "Made in GameMaker Studio 2", - "option_mac_enable_retina": false, - "option_mac_enable_steam": false, - "option_mac_icon_png": "${base_options_dir}\/mac\/icons\/1024.png", - "option_mac_interpolate_pixels": false, - "option_mac_menu_dock": false, - "option_mac_output_dir": "~\/GameMakerStudio2\/Mac", - "option_mac_resize_window": false, - "option_mac_scale": 0, - "option_mac_signing_identity": "Developer ID Application:", - "option_mac_splash_png": "${base_options_dir}\/mac\/splash\/splash.png", - "option_mac_start_fullscreen": false, - "option_mac_team_id": null, - "option_mac_texture_page": "2048x2048", - "option_mac_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - }, - "option_mac_vsync": false + "option_mac_display_name": "Made in GameMaker Studio 2", + "option_mac_app_id": "com.company.game", + "option_mac_version": "1.0.0.0", + "option_mac_output_dir": "~/GameMakerStudio2/Mac", + "option_mac_team_id": null, + "option_mac_signing_identity": "Developer ID Application:", + "option_mac_copyright": "(c) 2018 CompanyName", + "option_mac_splash_png": "${base_options_dir}/mac/splash/splash.png", + "option_mac_icon_png": "${base_options_dir}/mac/icons/1024.png", + "option_mac_menu_dock": false, + "option_mac_display_cursor": true, + "option_mac_start_fullscreen": false, + "option_mac_allow_fullscreen": false, + "option_mac_interpolate_pixels": false, + "option_mac_vsync": false, + "option_mac_resize_window": false, + "option_mac_enable_retina": false, + "option_mac_scale": 0, + "option_mac_texture_page": "2048x2048", + "option_mac_build_app_store": false, + "option_mac_allow_incoming_network": false, + "option_mac_allow_outgoing_network": false, + "option_mac_app_category": "Games", + "option_mac_enable_steam": false, + "option_mac_disable_sandbox": false, + "option_mac_apple_sign_in": false, + "resourceVersion": "1.0", + "name": "macOS", + "tags": [], + "resourceType": "GMMacOptions", } \ No newline at end of file diff --git a/options/main/options_main.yy b/options/main/options_main.yy new file mode 100644 index 00000000..11538875 --- /dev/null +++ b/options/main/options_main.yy @@ -0,0 +1,18 @@ +{ + "option_gameguid": "903ca60a-ecf4-4831-b61f-fc12bfdf5eb9", + "option_game_speed": 60, + "option_mips_for_3d_textures": false, + "option_draw_colour": 4294967295, + "option_window_colour": 255, + "option_steam_app_id": "0", + "option_sci_usesci": false, + "option_author": "", + "option_lastchanged": "02 April 2019 13:26:05", + "addon_amazon_apis": "", + "addon_google_play_services": "", + "option_spine_licence": false, + "resourceVersion": "1.1", + "name": "Main", + "tags": [], + "resourceType": "GMMainOptions", +} \ No newline at end of file diff --git a/options/ps4/options_ps4.yy b/options/ps4/options_ps4.yy index ad713126..72d35b6b 100644 --- a/options/ps4/options_ps4.yy +++ b/options/ps4/options_ps4.yy @@ -1,42 +1,36 @@ { - "id": "3a5af38c-757d-44ae-98c0-5d4b09e14e6a", - "modelName": "GMPS4Options", - "mvc": "1.1", - "name": "PlayStation 4", - "option_ps4_display_cursor": false, - "option_ps4_garlic": 1024, - "option_ps4_icon": "${base_options_dir}\\ps4\\sce_sys\\icon0.png", - "option_ps4_interpolate_pixels": false, - "option_ps4_max_display_height": -1, - "option_ps4_max_display_width": -1, - "option_ps4_neo_garlic": 1536, - "option_ps4_neo_onion": 2048, - "option_ps4_nptitledat": null, - "option_ps4_nptitledat_file": "${options_dir}\\ps4\\sce_sys\\nptitle.dat", - "option_ps4_nptitleid": "", - "option_ps4_nptitlesecret": "", - "option_ps4_onion": 2048, - "option_ps4_package_id": "IV0002-NPXS29129_00-APP0990000000022", - "option_ps4_paramsfo": "0", - "option_ps4_paramsfo_file": "${options_dir}\\ps4\\sce_sys\\param.sfo", - "option_ps4_passcode": "GvE6xCpZxd96scOUGuLPbuLp8O800B0s", - "option_ps4_pronunciation": null, - "option_ps4_pronunciation_file": "${options_dir}\\ps4\\sce_sys\\pronunciation.xml", - "option_ps4_pronunciation_sig": "${options_dir}\\ps4\\sce_sys\\pronunciation.sig", - "option_ps4_save_data_icon": "${base_options_dir}\\ps4\\sce_sys\\save_data.png", - "option_ps4_scale": 0, - "option_ps4_shareoverlay_image": "${base_options_dir}\\ps4\\sce_sys\\shareoverlayimage.png", - "option_ps4_shareparam": null, - "option_ps4_shareparam_file": "${options_dir}\\ps4\\sce_sys\\shareparam.json", - "option_ps4_splash_screen": "${base_options_dir}\\ps4\\sce_sys\\pic1.png", - "option_ps4_texture_page": "2048x2048", - "option_ps4_trophy00trp_file": "${options_dir}\\ps4\\sce_sys\\trophy\\trophy00.trp", - "option_ps4_trophy_screen": "${base_options_dir}\\ps4\\sce_sys\\pic0.png", - "option_ps4_trophyedit": "0", - "option_ps4_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - } + "option_ps4_package_id": "IV0002-NPXS29129_00-APP0990000000022", + "option_ps4_passcode": "GvE6xCpZxd96scOUGuLPbuLp8O800B0s", + "option_ps4_nptitleid": "", + "option_ps4_nptitlesecret": "", + "option_ps4_paramsfo": "0", + "option_ps4_nptitledat": null, + "option_ps4_trophyedit": "0", + "option_ps4_shareparam": null, + "option_ps4_pronunciation": null, + "option_ps4_splash_screen": "${base_options_dir}\\ps4\\sce_sys\\pic1.png", + "option_ps4_save_data_icon": "${base_options_dir}\\ps4\\sce_sys\\save_data.png", + "option_ps4_trophy_screen": "${base_options_dir}\\ps4\\sce_sys\\pic0.png", + "option_ps4_interpolate_pixels": false, + "option_ps4_display_cursor": false, + "option_ps4_scale": 0, + "option_ps4_texture_page": "2048x2048", + "option_ps4_max_display_width": -1, + "option_ps4_max_display_height": -1, + "option_ps4_icon": "${base_options_dir}\\ps4\\sce_sys\\icon0.png", + "option_ps4_shareoverlay_image": "${base_options_dir}\\ps4\\sce_sys\\shareoverlayimage.png", + "option_ps4_nptitledat_file": "${options_dir}\\ps4\\sce_sys\\nptitle.dat", + "option_ps4_paramsfo_file": "${options_dir}\\ps4\\sce_sys\\param.sfo", + "option_ps4_trophy00trp_file": "${options_dir}\\ps4\\sce_sys\\trophy\\trophy00.trp", + "option_ps4_shareparam_file": "${options_dir}\\ps4\\sce_sys\\shareparam.json", + "option_ps4_pronunciation_file": "${options_dir}\\ps4\\sce_sys\\pronunciation.xml", + "option_ps4_pronunciation_sig": "${options_dir}\\ps4\\sce_sys\\pronunciation.sig", + "option_ps4_onion": 2048, + "option_ps4_garlic": 1024, + "option_ps4_neo_onion": 2048, + "option_ps4_neo_garlic": 1536, + "resourceVersion": "1.0", + "name": "PlayStation 4", + "tags": [], + "resourceType": "GMPS4Options", } \ No newline at end of file diff --git a/options/switch/options_switch.yy b/options/switch/options_switch.yy index fab43c6a..b2cc162e 100644 --- a/options/switch/options_switch.yy +++ b/options/switch/options_switch.yy @@ -1,13 +1,15 @@ { - "id": "3a5af38c-757d-41ae-98c0-5d4b09e14e6a", - "modelName": "GMSwitchOptions", - "mvc": "1.0", - "name": "Switch", - "option_switch_check_nsp_publish_errors": true, - "option_switch_enable_fileaccess_checking": true, - "option_switch_enable_nex_libraries": false, - "option_switch_interpolate_pixels": true, - "option_switch_project_nmeta": "${options_dir}\/switch\/application.nmeta", - "option_switch_scale": 0, - "option_switch_texture_page": "2048x2048" + "option_switch_project_nmeta": "${options_dir}/switch/application.nmeta", + "option_switch_enable_nex_libraries": false, + "option_switch_interpolate_pixels": true, + "option_switch_scale": 0, + "option_switch_texture_page": "2048x2048", + "option_switch_check_nsp_publish_errors": true, + "option_switch_enable_fileaccess_checking": true, + "option_switch_splash_screen": "${base_options_dir}\\switch\\splash.png", + "option_switch_use_splash": false, + "resourceVersion": "1.0", + "name": "Switch", + "tags": [], + "resourceType": "GMSwitchOptions", } \ No newline at end of file diff --git a/options/tvos/options_tvos.yy b/options/tvos/options_tvos.yy index a7b75542..a31cba0c 100644 --- a/options/tvos/options_tvos.yy +++ b/options/tvos/options_tvos.yy @@ -1,31 +1,27 @@ { - "id": "93566aad-c3b3-48a9-8fa7-9c5ee19f74ac", - "modelName": "GMtvOSOptions", - "mvc": "1.0", - "name": "tvOS", - "option_tvos_bundle_name": "com.company.game", - "option_tvos_display_cursor": false, - "option_tvos_display_name": "Made in GameMaker Studio 2", - "option_tvos_icon_1280": "${base_options_dir}\\tvos\\icons\\1280.png", - "option_tvos_icon_400": "${base_options_dir}\\tvos\\icons\\400.png", - "option_tvos_icon_400_2x": "${base_options_dir}\\tvos\\icons\\400_2x.png", - "option_tvos_interpolate_pixels": true, - "option_tvos_output_dir": "~\/GameMakerStudio2\/tvOS", - "option_tvos_push_notifications": false, - "option_tvos_scale": 0, - "option_tvos_splash_time": 10, - "option_tvos_splashscreen": "${base_options_dir}\\tvos\\splash\\splash.png", - "option_tvos_splashscreen_2x": "${base_options_dir}\\tvos\\splash\\splash_2x.png", - "option_tvos_team_id": "", - "option_tvos_texture_page": "2048x2048", - "option_tvos_topshelf": "${base_options_dir}\\tvos\\topshelf\\topshelf.png", - "option_tvos_topshelf_2x": "${base_options_dir}\\tvos\\topshelf\\topshelf_2x.png", - "option_tvos_topshelf_wide": "${base_options_dir}\\tvos\\topshelf\\topshelf_wide.png", - "option_tvos_topshelf_wide_2x": "${base_options_dir}\\tvos\\topshelf\\topshelf_wide_2x.png", - "option_tvos_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - } + "option_tvos_display_name": "Made in GameMaker Studio 2", + "option_tvos_bundle_name": "com.company.game", + "option_tvos_version": "1.0.0.0", + "option_tvos_output_dir": "~/GameMakerStudio2/tvOS", + "option_tvos_team_id": "", + "option_tvos_icon_400": "${base_options_dir}\\tvos\\icons\\400.png", + "option_tvos_icon_400_2x": "${base_options_dir}\\tvos\\icons\\400_2x.png", + "option_tvos_icon_1280": "${base_options_dir}\\tvos\\icons\\1280.png", + "option_tvos_topshelf": "${base_options_dir}\\tvos\\topshelf\\topshelf.png", + "option_tvos_topshelf_2x": "${base_options_dir}\\tvos\\topshelf\\topshelf_2x.png", + "option_tvos_topshelf_wide": "${base_options_dir}\\tvos\\topshelf\\topshelf_wide.png", + "option_tvos_topshelf_wide_2x": "${base_options_dir}\\tvos\\topshelf\\topshelf_wide_2x.png", + "option_tvos_splashscreen": "${base_options_dir}\\tvos\\splash\\splash.png", + "option_tvos_splashscreen_2x": "${base_options_dir}\\tvos\\splash\\splash_2x.png", + "option_tvos_splash_time": 10, + "option_tvos_interpolate_pixels": true, + "option_tvos_scale": 0, + "option_tvos_texture_page": "2048x2048", + "option_tvos_display_cursor": false, + "option_tvos_push_notifications": false, + "option_tvos_apple_sign_in": false, + "resourceVersion": "1.0", + "name": "tvOS", + "tags": [], + "resourceType": "GMtvOSOptions", } \ No newline at end of file diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 240c8736..164e6a30 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -1,40 +1,35 @@ { - "id": "cc98d028-7bdd-4680-85f3-c87a7baa481e", - "modelName": "GMWindowsOptions", - "mvc": "1.0", - "name": "Windows", - "option_windows_allow_fullscreen_switching": false, - "option_windows_borderless": false, - "option_windows_company_info": "@jujuadams", - "option_windows_copy_exe_to_dest": false, - "option_windows_copyright_info": "@jujuadams (c) 2019", - "option_windows_description_info": "Chatterbox", - "option_windows_disable_sandbox": false, - "option_windows_display_cursor": true, - "option_windows_display_name": "Chatterbox", - "option_windows_enable_steam": false, - "option_windows_executable_name": "${project_name}", - "option_windows_icon": "${base_options_dir}\\windows\\icons\\icon.ico", - "option_windows_installer_finished": "${base_options_dir}\\windows\\installer\\finished.bmp", - "option_windows_installer_header": "${base_options_dir}\\windows\\installer\\header.bmp", - "option_windows_interpolate_pixels": true, - "option_windows_license": "${base_options_dir}\\windows\\installer\\license.txt", - "option_windows_nsis_file": "${base_options_dir}\\windows\\installer\\nsis_script.nsi", - "option_windows_product_info": "Chatterbox", - "option_windows_resize_window": false, - "option_windows_save_location": 0, - "option_windows_scale": 0, - "option_windows_sleep_margin": 10, - "option_windows_splash_screen": "${base_options_dir}\\windows\\splash\\splash.png", - "option_windows_start_fullscreen": false, - "option_windows_steam_use_alternative_launcher": false, - "option_windows_texture_page": "2048x2048", - "option_windows_use_splash": false, - "option_windows_version": { - "build": 0, - "major": 0, - "minor": 2, - "revision": 0 - }, - "option_windows_vsync": false + "option_windows_display_name": "Chatterbox", + "option_windows_executable_name": "${project_name}", + "option_windows_version": "0.2.0.0", + "option_windows_company_info": "@jujuadams", + "option_windows_product_info": "Chatterbox", + "option_windows_copyright_info": "@jujuadams (c) 2019", + "option_windows_description_info": "Chatterbox", + "option_windows_display_cursor": true, + "option_windows_icon": "${base_options_dir}\\windows\\icons\\icon.ico", + "option_windows_save_location": 0, + "option_windows_splash_screen": "${base_options_dir}\\windows\\splash\\splash.png", + "option_windows_use_splash": false, + "option_windows_start_fullscreen": false, + "option_windows_allow_fullscreen_switching": false, + "option_windows_interpolate_pixels": true, + "option_windows_vsync": false, + "option_windows_resize_window": false, + "option_windows_borderless": false, + "option_windows_scale": 0, + "option_windows_copy_exe_to_dest": false, + "option_windows_sleep_margin": 10, + "option_windows_texture_page": "2048x2048", + "option_windows_installer_finished": "${base_options_dir}\\windows\\installer\\finished.bmp", + "option_windows_installer_header": "${base_options_dir}\\windows\\installer\\header.bmp", + "option_windows_license": "${base_options_dir}\\windows\\installer\\license.txt", + "option_windows_nsis_file": "${base_options_dir}\\windows\\installer\\nsis_script.nsi", + "option_windows_enable_steam": false, + "option_windows_disable_sandbox": false, + "option_windows_steam_use_alternative_launcher": false, + "resourceVersion": "1.0", + "name": "Windows", + "tags": [], + "resourceType": "GMWindowsOptions", } \ No newline at end of file diff --git a/options/windowsuap/options_windowsuap.yy b/options/windowsuap/options_windowsuap.yy index 65689ea2..afaf4b13 100644 --- a/options/windowsuap/options_windowsuap.yy +++ b/options/windowsuap/options_windowsuap.yy @@ -1,53 +1,45 @@ { - "id": "7e093a2a-e51c-4a1e-9a53-f9080d38730b", - "modelName": "GMWindowsUAPOptions", - "mvc": "1.0", - "name": "Windows UWP", - "option_windowsuap_allow_fullscreen_switching": false, - "option_windowsuap_certificate_location": "${base_options_dir}\\windowsuap\\keys\\WinUWPRunner_TemporaryKey.pfx", - "option_windowsuap_certificate_publishername": "CN=Sandbox", - "option_windowsuap_display_cursor": true, - "option_windowsuap_display_name": "Made in GameMaker Studio 2", - "option_windowsuap_iap_sandbox": false, - "option_windowsuap_internet_capable": false, - "option_windowsuap_interpolate_pixels": false, - "option_windowsuap_large_logo": "${base_options_dir}\\windowsuap\\logos\\LargeLogo.scale-100.png", - "option_windowsuap_logo": "${base_options_dir}\\windowsuap\\logos\\Logo.scale-100.png", - "option_windowsuap_logo_background_colour": { - "Value": 4278190080 - }, - "option_windowsuap_logo_foreground_text": 0, - "option_windowsuap_microphone_capable": false, - "option_windowsuap_native_cpu": 0, - "option_windowsuap_orient_landscape": true, - "option_windowsuap_orient_landscape_flipped": true, - "option_windowsuap_orient_portrait": true, - "option_windowsuap_orient_portrait_flipped": true, - "option_windowsuap_package_display_name": "YourPackageDisplayName", - "option_windowsuap_package_name": "YourPackageName", - "option_windowsuap_publisher_display_name": "YourPublisherName", - "option_windowsuap_scale": 0, - "option_windowsuap_small_logo": "${base_options_dir}\\windowsuap\\logos\\SmallLogo.scale-100.png", - "option_windowsuap_smallish_logo": "${base_options_dir}\\windowsuap\\logos\\SmallishLogo.scale-100.png", - "option_windowsuap_splash_background_colour": { - "Value": 4278190080 - }, - "option_windowsuap_splash_png": "${base_options_dir}\\windowsuap\\splash\\SplashScreen.scale-100.png", - "option_windowsuap_start_fullscreen": false, - "option_windowsuap_store_logo": "${base_options_dir}\\windowsuap\\logos\\StoreLogo.scale-100.png", - "option_windowsuap_target_platform_min_version": "10.0.14393.0", - "option_windowsuap_target_platform_version": "10.0.14393.0", - "option_windowsuap_texture_page": "2048x2048", - "option_windowsuap_use_synchronization": true, - "option_windowsuap_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - }, - "option_windowsuap_wide_logo": "${base_options_dir}\\windowsuap\\logos\\WideLogo.scale-100.png", - "option_windowsuap_xbox_live": false, - "option_windowsuap_xbox_live_creators_program": false, - "option_windowsuap_xbox_live_scid": null, - "option_windowsuap_xbox_live_title_id": 0 + "option_windowsuap_display_name": "Made in GameMaker Studio 2", + "option_windowsuap_package_name": "YourPackageName", + "option_windowsuap_publisher_display_name": "YourPublisherName", + "option_windowsuap_package_display_name": "YourPackageDisplayName", + "option_windowsuap_description": null, + "option_windowsuap_version": "1.0.0.0", + "option_windowsuap_orient_portrait": true, + "option_windowsuap_orient_portrait_flipped": true, + "option_windowsuap_orient_landscape": true, + "option_windowsuap_orient_landscape_flipped": true, + "option_windowsuap_small_logo": "${base_options_dir}\\windowsuap\\logos\\SmallLogo.scale-100.png", + "option_windowsuap_smallish_logo": "${base_options_dir}\\windowsuap\\logos\\SmallishLogo.scale-100.png", + "option_windowsuap_store_logo": "${base_options_dir}\\windowsuap\\logos\\StoreLogo.scale-100.png", + "option_windowsuap_logo": "${base_options_dir}\\windowsuap\\logos\\Logo.scale-100.png", + "option_windowsuap_logo_background_colour": 4278190080, + "option_windowsuap_logo_foreground_text": 0, + "option_windowsuap_wide_logo": "${base_options_dir}\\windowsuap\\logos\\WideLogo.scale-100.png", + "option_windowsuap_large_logo": "${base_options_dir}\\windowsuap\\logos\\LargeLogo.scale-100.png", + "option_windowsuap_splash_png": "${base_options_dir}\\windowsuap\\splash\\SplashScreen.scale-100.png", + "option_windowsuap_splash_background_colour": 4278190080, + "option_windowsuap_interpolate_pixels": false, + "option_windowsuap_display_cursor": true, + "option_windowsuap_start_fullscreen": false, + "option_windowsuap_allow_fullscreen_switching": false, + "option_windowsuap_use_synchronization": true, + "option_windowsuap_scale": 0, + "option_windowsuap_texture_page": "2048x2048", + "option_windowsuap_certificate_location": "${base_options_dir}\\windowsuap\\keys\\WinUWPRunner_TemporaryKey.pfx", + "option_windowsuap_certificate_publishername": "CN=Sandbox", + "option_windowsuap_native_cpu": 0, + "option_windowsuap_internet_capable": false, + "option_windowsuap_microphone_capable": false, + "option_windowsuap_iap_sandbox": false, + "option_windowsuap_target_platform_version": "10.0.14393.0", + "option_windowsuap_target_platform_min_version": "10.0.14393.0", + "option_windowsuap_xbox_live": false, + "option_windowsuap_xbox_live_creators_program": false, + "option_windowsuap_xbox_live_title_id": 0, + "option_windowsuap_xbox_live_scid": null, + "resourceVersion": "1.0", + "name": "Windows UWP", + "tags": [], + "resourceType": "GMWindowsUAPOptions", } \ No newline at end of file diff --git a/options/xboxone/options_xboxone.yy b/options/xboxone/options_xboxone.yy index 44efc73d..01ab0248 100644 --- a/options/xboxone/options_xboxone.yy +++ b/options/xboxone/options_xboxone.yy @@ -1,47 +1,38 @@ { - "id": "f85efd3d-bcec-4ec0-8226-da808afda79d", - "modelName": "GMXBoxOneOptions", - "mvc": "1.0", - "name": "Xbox One", - "option_xbone_description": "Your Description", - "option_xbone_display_name": "Made in GameMaker Studio 2", - "option_xbone_foreground_text": 0, - "option_xbone_game_chat_slots": 4, - "option_xbone_interpolate_pixels": false, - "option_xbone_languages": "\\u000a \\u000a \\u000a \\u000a ", - "option_xbone_logo_background_colour": { - "Value": 4282795590 - }, - "option_xbone_logo_large": "${base_options_dir}\\xboxone\\logos\\Logo.png", - "option_xbone_logo_small": "${base_options_dir}\\xboxone\\logos\\SmallLogo.png", - "option_xbone_logo_store": "${base_options_dir}\\xboxone\\logos\\StoreLogo.png", - "option_xbone_logo_wide": "${base_options_dir}\\xboxone\\logos\\WideLogo.png", - "option_xbone_network_config_manifest": "", - "option_xbone_product_id": "", - "option_xbone_program_id": "A149997C-9864-464E-9E03-8E06832F4CFF", - "option_xbone_publisher": "Company Name", - "option_xbone_publisher_display_name": "Company Display Name", - "option_xbone_ratings": "\\u000a \\u000a \\u000a \\u000a <\/mx:Ratings>", - "option_xbone_require_audio_recording": false, - "option_xbone_require_game_chat": false, - "option_xbone_require_xbox_live": false, - "option_xbone_scale": 0, - "option_xbone_service_config_id": "00000000-0000-0000-0000-000000000000", - "option_xbone_service_config_manifest": "", - "option_xbone_splash_screen": "${base_options_dir}\\xboxone\\SplashScreen.png", - "option_xbone_splash_screen_colour": { - "Value": 4282795590 - }, - "option_xbone_stats_system": 0, - "option_xbone_support_4k_one_s": false, - "option_xbone_support_4k_one_x": false, - "option_xbone_texture_page": "2048x2048", - "option_xbone_title_id": "00000000", - "option_xbone_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - }, - "option_xbone_x_title_memory": 5 + "option_xbone_display_name": "Made in GameMaker Studio 2", + "option_xbone_description": "Your Description", + "option_xbone_publisher": "Company Name", + "option_xbone_publisher_display_name": "Company Display Name", + "option_xbone_version": "1.0.0.0", + "option_xbone_product_id": "", + "option_xbone_title_id": "00000000", + "option_xbone_service_config_id": "00000000-0000-0000-0000-000000000000", + "option_xbone_program_id": "A149997C-9864-464E-9E03-8E06832F4CFF", + "option_xbone_require_xbox_live": false, + "option_xbone_require_game_chat": false, + "option_xbone_game_chat_slots": 4, + "option_xbone_require_audio_recording": false, + "option_xbone_x_title_memory": 5, + "option_xbone_stats_system": 0, + "option_xbone_service_config_manifest": "", + "option_xbone_network_config_manifest": "", + "option_xbone_splash_screen": "${base_options_dir}\\xboxone\\SplashScreen.png", + "option_xbone_splash_screen_colour": 4282795590, + "option_xbone_logo_store": "${base_options_dir}\\xboxone\\logos\\StoreLogo.png", + "option_xbone_logo_small": "${base_options_dir}\\xboxone\\logos\\SmallLogo.png", + "option_xbone_logo_large": "${base_options_dir}\\xboxone\\logos\\Logo.png", + "option_xbone_logo_wide": "${base_options_dir}\\xboxone\\logos\\WideLogo.png", + "option_xbone_logo_background_colour": 4282795590, + "option_xbone_foreground_text": 0, + "option_xbone_interpolate_pixels": false, + "option_xbone_scale": 0, + "option_xbone_texture_page": "2048x2048", + "option_xbone_support_4k_one_x": false, + "option_xbone_support_4k_one_s": false, + "option_xbone_ratings": "\\u000a \\u000a \\u000a \\u000a ", + "option_xbone_languages": "\\u000a \\u000a \\u000a \\u000a ", + "resourceVersion": "1.0", + "name": "Xbox One", + "tags": [], + "resourceType": "GMXBoxOneOptions", } \ No newline at end of file diff --git a/rooms/rExample/rExample.yy b/rooms/rExample/rExample.yy index 7253013e..abe61832 100644 --- a/rooms/rExample/rExample.yy +++ b/rooms/rExample/rExample.yy @@ -1,117 +1,56 @@ - { - "name": "rExample", - "id": "7887bc75-4b33-4846-bd70-275cf18456f4", - "creationCodeFile": "", - "inheritCode": false, - "inheritCreationOrder": false, - "inheritLayers": false, - "instanceCreationOrderIDs": [ - "5bb8b9e8-9fcc-4c5a-9e35-2b036f6321df" - ], - "IsDnD": false, - "layers": [ - { - "__type": "GMRInstanceLayer_Model:#YoYoStudio.MVCFormat", - "name": "Example", - "id": "020c2c1a-36e6-413c-a5bc-ed2f5a821906", - "depth": 0, - "grid_x": 32, - "grid_y": 32, - "hierarchyFrozen": false, - "hierarchyVisible": true, - "inheritLayerDepth": false, - "inheritLayerSettings": false, - "inheritSubLayers": false, - "inheritVisibility": false, - "instances": [ -{"name": "inst_7ECEB38D","id": "5bb8b9e8-9fcc-4c5a-9e35-2b036f6321df","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_7ECEB38D","objId": "8f58bbbe-3dba-44de-b201-00643bc3496c","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.0","x": 480,"y": 270} - ], - "layers": [ - - ], - "m_parentID": "00000000-0000-0000-0000-000000000000", - "m_serialiseFrozen": false, - "modelName": "GMRInstanceLayer", - "mvc": "1.0", - "userdefined_depth": false, - "visible": true - }, - { - "__type": "GMRBackgroundLayer_Model:#YoYoStudio.MVCFormat", - "name": "Background", - "id": "d89ce697-8d6b-4d01-8741-e4d94d3b5ed6", - "animationFPS": 15, - "animationSpeedType": "0", - "colour": { "Value": 4281542935 }, - "depth": 100, - "grid_x": 32, - "grid_y": 32, - "hierarchyFrozen": false, - "hierarchyVisible": true, - "hspeed": 0, - "htiled": false, - "inheritLayerDepth": false, - "inheritLayerSettings": false, - "inheritSubLayers": false, - "inheritVisibility": false, - "layers": [ - - ], - "m_parentID": "00000000-0000-0000-0000-000000000000", - "m_serialiseFrozen": false, - "modelName": "GMRBackgroundLayer", - "mvc": "1.0", - "spriteId": "00000000-0000-0000-0000-000000000000", - "stretch": false, - "userdefined_animFPS": false, - "userdefined_depth": false, - "visible": true, - "vspeed": 0, - "vtiled": false, - "x": 0, - "y": 0 - } - ], - "modelName": "GMRoom", - "parentId": "00000000-0000-0000-0000-000000000000", - "physicsSettings": { - "id": "e3dee856-4cdc-4ac8-ba4e-172b8e318fcf", - "inheritPhysicsSettings": false, - "modelName": "GMRoomPhysicsSettings", - "PhysicsWorld": false, - "PhysicsWorldGravityX": 0, - "PhysicsWorldGravityY": 10, - "PhysicsWorldPixToMeters": 0.1, - "mvc": "1.0" - }, - "roomSettings": { - "id": "5633f6f7-877f-40a9-8ade-4b85c522f950", - "Height": 1080, - "inheritRoomSettings": false, - "modelName": "GMRoomSettings", - "persistent": false, - "mvc": "1.0", - "Width": 1920 - }, - "mvc": "1.0", - "views": [ -{"id": "8abce36f-675c-40af-af05-42cfa65f4c42","hborder": 32,"hport": 1080,"hspeed": -1,"hview": 540,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": true,"vspeed": -1,"wport": 1920,"wview": 960,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "596ba9a9-3182-4e62-98b6-d1bc3232124e","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "f27d67d1-ef7b-4bd7-99fb-ff044e712162","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "17e2ce49-8b2a-4dbd-947c-804ae5c55ca3","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "e5f3f558-536e-469c-9cd3-a07ff62e8e15","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "100bf2a9-1127-46d8-a9ba-fd54da493da8","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "c3c93115-b3a1-4c90-ac99-cd349c91d4b7","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "91736b85-fd0e-4ecb-8451-15b03235601e","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0} - ], - "viewSettings": { - "id": "4d09ae29-c431-42ca-9285-3e4710520d7e", - "clearDisplayBuffer": true, - "clearViewBackground": false, - "enableViews": true, - "inheritViewSettings": false, - "modelName": "GMRoomViewSettings", - "mvc": "1.0" - } + "isDnd": false, + "volume": 1.0, + "parentRoom": null, + "views": [ + {"inherit":false,"visible":true,"xview":0,"yview":0,"wview":960,"hview":540,"xport":0,"yport":0,"wport":1920,"hport":1080,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1024,"hview":768,"xport":0,"yport":0,"wport":1024,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1024,"hview":768,"xport":0,"yport":0,"wport":1024,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1024,"hview":768,"xport":0,"yport":0,"wport":1024,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1024,"hview":768,"xport":0,"yport":0,"wport":1024,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1024,"hview":768,"xport":0,"yport":0,"wport":1024,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1024,"hview":768,"xport":0,"yport":0,"wport":1024,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1024,"hview":768,"xport":0,"yport":0,"wport":1024,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + ], + "layers": [ + {"instances":[ + {"properties":[],"isDnd":false,"objectId":{"name":"oBeginnerExample","path":"objects/oBeginnerExample/oBeginnerExample.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":480.0,"y":270.0,"resourceVersion":"1.0","name":"inst_7ECEB38D","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",}, + ], + "inheritLayers": false, + "creationCodeFile": "", + "inheritCode": false, + "instanceCreationOrder": [ + {"name":"inst_7ECEB38D","path":"rooms/rExample/rExample.yy",}, + ], + "inheritCreationOrder": false, + "sequenceId": null, + "roomSettings": { + "inheritRoomSettings": false, + "Width": 1920, + "Height": 1080, + "persistent": false, + }, + "viewSettings": { + "inheritViewSettings": false, + "enableViews": true, + "clearViewBackground": false, + "clearDisplayBuffer": true, + }, + "physicsSettings": { + "inheritPhysicsSettings": false, + "PhysicsWorld": false, + "PhysicsWorldGravityX": 0.0, + "PhysicsWorldGravityY": 10.0, + "PhysicsWorldPixToMetres": 0.1, + }, + "parent": { + "name": "Rooms", + "path": "folders/Rooms.yy", + }, + "resourceVersion": "1.0", + "name": "rExample", + "tags": [], + "resourceType": "GMRoom", } \ No newline at end of file diff --git a/rooms/rInit/rInit.yy b/rooms/rInit/rInit.yy index 9558eae7..5562073b 100644 --- a/rooms/rInit/rInit.yy +++ b/rooms/rInit/rInit.yy @@ -1,117 +1,56 @@ - { - "name": "rInit", - "id": "8e242548-7b78-464a-bb38-54a74acce8a4", - "creationCodeFile": "", - "inheritCode": false, - "inheritCreationOrder": false, - "inheritLayers": false, - "instanceCreationOrderIDs": [ - "5460cbab-f9d1-499f-8b4b-211dd40e59e9" - ], - "IsDnD": false, - "layers": [ - { - "__type": "GMRInstanceLayer_Model:#YoYoStudio.MVCFormat", - "name": "Instances", - "id": "60998636-7861-4b14-aecb-f05a1926029c", - "depth": 0, - "grid_x": 32, - "grid_y": 32, - "hierarchyFrozen": false, - "hierarchyVisible": true, - "inheritLayerDepth": false, - "inheritLayerSettings": false, - "inheritSubLayers": false, - "inheritVisibility": false, - "instances": [ -{"name": "inst_5C8576","id": "5460cbab-f9d1-499f-8b4b-211dd40e59e9","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_5C8576","objId": "f0d55121-d1e8-45b8-ac57-b1a98bfb38a3","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.0","x": 32,"y": 32} - ], - "layers": [ - - ], - "m_parentID": "00000000-0000-0000-0000-000000000000", - "m_serialiseFrozen": false, - "modelName": "GMRInstanceLayer", - "mvc": "1.0", - "userdefined_depth": false, - "visible": true - }, - { - "__type": "GMRBackgroundLayer_Model:#YoYoStudio.MVCFormat", - "name": "Background", - "id": "988d3371-5839-4d17-adbd-a34f3b4156e8", - "animationFPS": 15, - "animationSpeedType": "0", - "colour": { "Value": 4278190080 }, - "depth": 100, - "grid_x": 32, - "grid_y": 32, - "hierarchyFrozen": false, - "hierarchyVisible": true, - "hspeed": 0, - "htiled": false, - "inheritLayerDepth": false, - "inheritLayerSettings": false, - "inheritSubLayers": false, - "inheritVisibility": false, - "layers": [ - - ], - "m_parentID": "00000000-0000-0000-0000-000000000000", - "m_serialiseFrozen": false, - "modelName": "GMRBackgroundLayer", - "mvc": "1.0", - "spriteId": "00000000-0000-0000-0000-000000000000", - "stretch": false, - "userdefined_animFPS": false, - "userdefined_depth": false, - "visible": true, - "vspeed": 0, - "vtiled": false, - "x": 0, - "y": 0 - } - ], - "modelName": "GMRoom", - "parentId": "00000000-0000-0000-0000-000000000000", - "physicsSettings": { - "id": "aed4e729-9241-43bf-a5bc-91d6b4fb1dea", - "inheritPhysicsSettings": false, - "modelName": "GMRoomPhysicsSettings", - "PhysicsWorld": false, - "PhysicsWorldGravityX": 0, - "PhysicsWorldGravityY": 10, - "PhysicsWorldPixToMeters": 0.1, - "mvc": "1.0" - }, - "roomSettings": { - "id": "4eed099e-8b7b-4187-83c8-48b8fdbdca26", - "Height": 540, - "inheritRoomSettings": false, - "modelName": "GMRoomSettings", - "persistent": false, - "mvc": "1.0", - "Width": 960 - }, - "mvc": "1.0", - "views": [ -{"id": "87e39c8c-55d3-49f9-aa15-99de159f0ee5","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "70445246-2cf6-442c-8fe9-0c97a7381523","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "d1d3bc35-2198-4ed6-bc9d-1a602379799e","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "63d668fd-ec1c-4768-b36c-16c47dd676f2","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "cf8bf163-2174-45c0-85f3-5ee878b122e6","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "eebc846d-70f9-4ff4-85d3-022da8aa6188","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "44d1c642-b474-40ec-be41-52d36a62774e","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "4337371f-17e3-4886-af8f-bf4d8c3bf633","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0} - ], - "viewSettings": { - "id": "82489d11-60c2-4d0c-a1e4-7f4dd0bcc45b", - "clearDisplayBuffer": true, - "clearViewBackground": false, - "enableViews": false, - "inheritViewSettings": false, - "modelName": "GMRoomViewSettings", - "mvc": "1.0" - } + "isDnd": false, + "volume": 1.0, + "parentRoom": null, + "views": [ + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1024,"hview":768,"xport":0,"yport":0,"wport":1024,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1024,"hview":768,"xport":0,"yport":0,"wport":1024,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1024,"hview":768,"xport":0,"yport":0,"wport":1024,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1024,"hview":768,"xport":0,"yport":0,"wport":1024,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1024,"hview":768,"xport":0,"yport":0,"wport":1024,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1024,"hview":768,"xport":0,"yport":0,"wport":1024,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1024,"hview":768,"xport":0,"yport":0,"wport":1024,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1024,"hview":768,"xport":0,"yport":0,"wport":1024,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + ], + "layers": [ + {"instances":[ + {"properties":[],"isDnd":false,"objectId":{"name":"oInit","path":"objects/oInit/oInit.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_5C8576","tags":[],"resourceType":"GMRInstance",}, + ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Instances","tags":[],"resourceType":"GMRInstanceLayer",}, + {"spriteId":null,"colour":4278190080,"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",}, + ], + "inheritLayers": false, + "creationCodeFile": "", + "inheritCode": false, + "instanceCreationOrder": [ + {"name":"inst_5C8576","path":"rooms/rInit/rInit.yy",}, + ], + "inheritCreationOrder": false, + "sequenceId": null, + "roomSettings": { + "inheritRoomSettings": false, + "Width": 960, + "Height": 540, + "persistent": false, + }, + "viewSettings": { + "inheritViewSettings": false, + "enableViews": false, + "clearViewBackground": false, + "clearDisplayBuffer": true, + }, + "physicsSettings": { + "inheritPhysicsSettings": false, + "PhysicsWorld": false, + "PhysicsWorldGravityX": 0.0, + "PhysicsWorldGravityY": 10.0, + "PhysicsWorldPixToMetres": 0.1, + }, + "parent": { + "name": "Rooms", + "path": "folders/Rooms.yy", + }, + "resourceVersion": "1.0", + "name": "rInit", + "tags": [], + "resourceType": "GMRoom", } \ No newline at end of file diff --git a/scripts/__chatterbox_array_to_string/__chatterbox_array_to_string.gml b/scripts/__chatterbox_array_to_string/__chatterbox_array_to_string.gml index dababa42..e1143138 100644 --- a/scripts/__chatterbox_array_to_string/__chatterbox_array_to_string.gml +++ b/scripts/__chatterbox_array_to_string/__chatterbox_array_to_string.gml @@ -1,18 +1,22 @@ /// @param array +function __chatterbox_array_to_string(argument0) { -var _array = argument0; + var _array = argument0; -var _string = "["; + var _string = "["; -var _i = 0; -var _size = array_length_1d(_array); -repeat(_size) -{ - _string += __chatterbox_string(_array[_i]); - ++_i; - if (_i < _size) _string += " , "; -} + var _i = 0; + var _size = array_length_1d(_array); + repeat(_size) + { + _string += __chatterbox_string(_array[_i]); + ++_i; + if (_i < _size) _string += " , "; + } + + _string += "]"; -_string += "]"; + return _string; -return _string; \ No newline at end of file + +} diff --git a/scripts/__chatterbox_array_to_string/__chatterbox_array_to_string.yy b/scripts/__chatterbox_array_to_string/__chatterbox_array_to_string.yy index 11a1bf76..aac8d726 100644 --- a/scripts/__chatterbox_array_to_string/__chatterbox_array_to_string.yy +++ b/scripts/__chatterbox_array_to_string/__chatterbox_array_to_string.yy @@ -1,8 +1,12 @@ { - "id": "1c424e6a-baa6-493c-be83-daf99575559b", - "modelName": "GMScript", - "mvc": "1.0", - "name": "__chatterbox_array_to_string", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "__Private", + "path": "folders/Scripts/Chatterbox/__Private.yy", + }, + "resourceVersion": "1.0", + "name": "__chatterbox_array_to_string", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_config/__chatterbox_config.gml b/scripts/__chatterbox_config/__chatterbox_config.gml index 7f3e71a6..fe1102f3 100644 --- a/scripts/__chatterbox_config/__chatterbox_config.gml +++ b/scripts/__chatterbox_config/__chatterbox_config.gml @@ -1,3 +1,4 @@ +function __chatterbox_config() { #macro CHATTERBOX_OPTION_FALLBACK_ENABLE true // #macro CHATTERBOX_OPTION_FALLBACK_TEXT "..." //The option text to display if no option text has been found #macro CHATTERBOX_DEBUG false //Whether or not to show addition debug information whilst running Chatterbox @@ -7,7 +8,7 @@ #macro CHATTERBOX_DEFAULT_VARIABLE_VALUE 0 //Default value if a variable cannot be found -//More for information, please read "Variables & Conditionals" in __chatterbox_syntax() + //More for information, please read "Variables & Conditionals" in __chatterbox_syntax() #macro CHATTERBOX_SCOPE_INVALID -1 #macro CHATTERBOX_SCOPE_INTERNAL 0 @@ -24,8 +25,8 @@ #macro CHATTERBOX_INDENT_UNIT_SIZE 4 //The fundamental ident unit, usually 4. This is typically the width of a tab character. This is a critical property for correct execution! #macro CHATTERBOX_FILENAME_SEPARATOR ":" //The character used to separate filenames from node titles in redirects and options -//These variables control which delimiters to use for [[options]] and <> -//For compatibility with Yarn editors you probably don't want to change these + //These variables control which delimiters to use for [[options]] and <> + //For compatibility with Yarn editors you probably don't want to change these #macro CHATTERBOX_OPTION_OPEN_DELIMITER "[" #macro CHATTERBOX_OPTION_CLOSE_DELIMITER "]" #macro CHATTERBOX_ACTION_OPEN_DELIMITER "<" @@ -40,4 +41,7 @@ #macro CHATTERBOX_ERROR_ON_BAD_INDENTS true //Whether to check for misaligned indentation. Idents must be an integer multiple of CHATTERBOX_INDENT_UNIT_SIZE #macro CHATTERBOX_ERROR_ON_NONSTANDARD_SYNTAX true //Throws an error when using a reasonable, though technically illegal, syntax e.g. <> or <> -#endregion \ No newline at end of file +#endregion + + +} diff --git a/scripts/__chatterbox_config/__chatterbox_config.yy b/scripts/__chatterbox_config/__chatterbox_config.yy index dba689b0..05c57975 100644 --- a/scripts/__chatterbox_config/__chatterbox_config.yy +++ b/scripts/__chatterbox_config/__chatterbox_config.yy @@ -1,8 +1,12 @@ { - "id": "ca6010de-78da-4d2d-a06c-d8021e067eab", - "modelName": "GMScript", - "mvc": "1.0", - "name": "__chatterbox_config", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Chatterbox", + "path": "folders/Scripts/Chatterbox.yy", + }, + "resourceVersion": "1.0", + "name": "__chatterbox_config", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_error/__chatterbox_error.gml b/scripts/__chatterbox_error/__chatterbox_error.gml index 2975043b..486bc092 100644 --- a/scripts/__chatterbox_error/__chatterbox_error.gml +++ b/scripts/__chatterbox_error/__chatterbox_error.gml @@ -1,14 +1,18 @@ /// @param [value...] +function __chatterbox_error() { -var _string = ""; + var _string = ""; -var _i = 0; -repeat(argument_count) -{ - _string += string(argument[_i]); - ++_i; -} + var _i = 0; + repeat(argument_count) + { + _string += string(argument[_i]); + ++_i; + } + + show_error("Chatterbox:\n" + _string + "\n ", false); -show_error("Chatterbox:\n" + _string + "\n ", false); + return _string; -return _string; \ No newline at end of file + +} diff --git a/scripts/__chatterbox_error/__chatterbox_error.yy b/scripts/__chatterbox_error/__chatterbox_error.yy index e3a8deae..811e4675 100644 --- a/scripts/__chatterbox_error/__chatterbox_error.yy +++ b/scripts/__chatterbox_error/__chatterbox_error.yy @@ -1,8 +1,12 @@ { - "id": "0728437b-b2e3-4875-bbba-74bc28b777b0", - "modelName": "GMScript", - "mvc": "1.0", - "name": "__chatterbox_error", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "__Private", + "path": "folders/Scripts/Chatterbox/__Private.yy", + }, + "resourceVersion": "1.0", + "name": "__chatterbox_error", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_evaluate/__chatterbox_evaluate.gml b/scripts/__chatterbox_evaluate/__chatterbox_evaluate.gml index 311cd047..a520fc49 100644 --- a/scripts/__chatterbox_evaluate/__chatterbox_evaluate.gml +++ b/scripts/__chatterbox_evaluate/__chatterbox_evaluate.gml @@ -4,242 +4,246 @@ /// /// @param chatterboxHost /// @param contentArray +function __chatterbox_evaluate(argument0, argument1) { -var _chatterbox = argument0; -var _content = argument1; + var _chatterbox = argument0; + var _content = argument1; -var _filename = _chatterbox[ __CHATTERBOX_HOST.FILENAME ]; + var _filename = _chatterbox[ __CHATTERBOX_HOST.FILENAME ]; -var _resolved_array = array_create(array_length_1d(_content), pointer_null); //Copy the array + var _resolved_array = array_create(array_length_1d(_content), pointer_null); //Copy the array -var _queue = ds_list_create(); -ds_list_add(_queue, 1); -repeat(9999) -{ - if (ds_list_empty(_queue)) break; + var _queue = ds_list_create(); + ds_list_add(_queue, 1); + repeat(9999) + { + if (ds_list_empty(_queue)) break; - var _element_index = _queue[| 0]; - var _element = _content[_element_index]; + var _element_index = _queue[| 0]; + var _element = _content[_element_index]; - if (!is_array(_element)) - { - _resolved_array[_element_index] = _element; - ds_list_delete(_queue, 0); - } - else - { + if (!is_array(_element)) + { + _resolved_array[_element_index] = _element; + ds_list_delete(_queue, 0); + } + else + { #region Check if all elements have been resolved - var _fully_resolved = true; - var _element_length = array_length_1d(_element); - for(var _i = 0; _i < _element_length; _i++) - { - var _child_index = _element[_i]; - if (is_ptr(_resolved_array[_child_index]) && (_resolved_array[_child_index] == pointer_null)) - { - _fully_resolved = false; - ds_list_insert(_queue, 0, _child_index); - } - } + var _fully_resolved = true; + var _element_length = array_length_1d(_element); + for(var _i = 0; _i < _element_length; _i++) + { + var _child_index = _element[_i]; + if (is_ptr(_resolved_array[_child_index]) && (_resolved_array[_child_index] == pointer_null)) + { + _fully_resolved = false; + ds_list_insert(_queue, 0, _child_index); + } + } #endregion - if (_fully_resolved) - { - if ((_element_length >= 2) && (_resolved_array[_element[1]] == "()")) - { + if (_fully_resolved) + { + if ((_element_length >= 2) && (_resolved_array[_element[1]] == "()")) + { #region Function execution - var _result = undefined; - var _function = _resolved_array[_element[0]]; - - var _function_args = array_create(_element_length-2); - for(var _i = 2; _i < _element_length; _i++) _function_args[_i-2] = __chatterbox_resolve_value(_chatterbox, _resolved_array[_element[_i]]); - - if (_function == "visited") - { - if (_element_length == 3) _function_args[1] = _filename; - _result = CHATTERBOX_VARIABLES_MAP[? "visited(" + _function_args[1] + CHATTERBOX_FILENAME_SEPARATOR + _function_args[0] + ")" ]; - _result = (_result == undefined)? false : _result; - } - else - { - _function = global.__chatterbox_permitted_scripts[? _function ]; - if (_function != undefined) - { - _result = script_execute(_function, _function_args); + var _result = undefined; + var _function = _resolved_array[_element[0]]; + + var _function_args = array_create(_element_length-2); + for(var _i = 2; _i < _element_length; _i++) _function_args[_i-2] = __chatterbox_resolve_value(_chatterbox, _resolved_array[_element[_i]]); + + if (_function == "visited") + { + if (_element_length == 3) _function_args[1] = _filename; + _result = CHATTERBOX_VARIABLES_MAP[? "visited(" + _function_args[1] + CHATTERBOX_FILENAME_SEPARATOR + _function_args[0] + ")" ]; + _result = (_result == undefined)? false : _result; + } + else + { + _function = global.__chatterbox_permitted_scripts[? _function ]; + if (_function != undefined) + { + _result = script_execute(_function, _function_args); - var _typeof = typeof(_result); - if (_typeof == "array") || (_typeof == "ptr") || (_typeof == "null") || (_typeof == "vec3") || (_typeof == "vec4") - { - if (CHATTERBOX_ERROR_ON_INVALID_DATATYPE) - { - __chatterbox_error("Variable \"" + _result + "\" has an unsupported datatype (" + _typeof + ")"); - } - else - { - __chatterbox_trace("WARNING! Variable \"" + _result + "\" has an unsupported datatype (" + _typeof + ")"); - } + var _typeof = typeof(_result); + if (_typeof == "array") || (_typeof == "ptr") || (_typeof == "null") || (_typeof == "vec3") || (_typeof == "vec4") + { + if (CHATTERBOX_ERROR_ON_INVALID_DATATYPE) + { + __chatterbox_error("Variable \"" + _result + "\" has an unsupported datatype (" + _typeof + ")"); + } + else + { + __chatterbox_trace("WARNING! Variable \"" + _result + "\" has an unsupported datatype (" + _typeof + ")"); + } - _result = string(_result); - } + _result = string(_result); + } - if (_typeof == "bool") || (_typeof == "int32") || (_typeof == "int64") - { - _result = real(_result); - } - } - else - { - //Error! - } - } - - _resolved_array[_element_index] = is_string(_result)? ("\"" + string(_result) + "\"") : string(_result); + if (_typeof == "bool") || (_typeof == "int32") || (_typeof == "int64") + { + _result = real(_result); + } + } + else + { + //Error! + } + } + + _resolved_array[_element_index] = is_string(_result)? ("\"" + string(_result) + "\"") : string(_result); #endregion - } - else if (_element_length == 1) - { + } + else if (_element_length == 1) + { #region Resolve 1-length elements (usually a static value, but you never know) - var _result = undefined; - var _element_value = _element[0]; - if (is_real(_element_value)) - { - _resolved_array[_element_index] = _resolved_array[_element[0]]; - } - else - { - _resolved_array[_element_index] = _element[0]; - } + var _result = undefined; + var _element_value = _element[0]; + if (is_real(_element_value)) + { + _resolved_array[_element_index] = _resolved_array[_element[0]]; + } + else + { + _resolved_array[_element_index] = _element[0]; + } #endregion - } - else if (_element_length == 2) - { + } + else if (_element_length == 2) + { #region Resolve unary operators (!variable / -variable) - var _operator = _resolved_array[_element[0]]; - var _value = _resolved_array[_element[1]]; - _value = __chatterbox_resolve_value(_chatterbox, _value); - - var _result = undefined; - if (is_real(_value)) - { - if (_operator == "!") - { - _result = !_value; - } - else if (_operator == "-") - { - _result = -_value; - } - else - { - __chatterbox_trace("WARNING! 2-length evaluation element with unrecognised operator: \"" + string(_operator) + "\""); - } - } - - _resolved_array[_element_index] = is_string(_result)? ("\"" + string(_result) + "\"") : string(_result); + var _operator = _resolved_array[_element[0]]; + var _value = _resolved_array[_element[1]]; + _value = __chatterbox_resolve_value(_chatterbox, _value); + + var _result = undefined; + if (is_real(_value)) + { + if (_operator == "!") + { + _result = !_value; + } + else if (_operator == "-") + { + _result = -_value; + } + else + { + __chatterbox_trace("WARNING! 2-length evaluation element with unrecognised operator: \"" + string(_operator) + "\""); + } + } + + _resolved_array[_element_index] = is_string(_result)? ("\"" + string(_result) + "\"") : string(_result); #endregion - } - else if (_element_length == 3) - { + } + else if (_element_length == 3) + { #region Figure out datatypes and grab variable values - var _a = _resolved_array[_element[0]]; - var _operator = _resolved_array[_element[1]]; - var _b = _resolved_array[_element[2]]; + var _a = _resolved_array[_element[0]]; + var _operator = _resolved_array[_element[1]]; + var _b = _resolved_array[_element[2]]; - var _a_value = __chatterbox_resolve_value(_chatterbox, _a); - var _a_scope = global.__chatterbox_scope; - _a = (global.__chatterbox_variable_name != __CHATTERBOX_VARIABLE_INVALID)? global.__chatterbox_variable_name : _a; - global.__chatterbox_scope = CHATTERBOX_SCOPE_INVALID; - var _b_value = __chatterbox_resolve_value(_chatterbox, _b); + var _a_value = __chatterbox_resolve_value(_chatterbox, _a); + var _a_scope = global.__chatterbox_scope; + _a = (global.__chatterbox_variable_name != __CHATTERBOX_VARIABLE_INVALID)? global.__chatterbox_variable_name : _a; + global.__chatterbox_scope = CHATTERBOX_SCOPE_INVALID; + var _b_value = __chatterbox_resolve_value(_chatterbox, _b); #endregion #region Resolve binary operators - var _result = undefined; - var _set = false; - - var _both_real = (is_real(_a_value) && is_real(_b_value)); - var _matching_types = (typeof(_a_value) == typeof(_b_value)); - var _either_string = (is_string(_a_value) || is_string(_b_value)); - var _neither_undefined = (!is_undefined(_a_value) && !is_undefined(_b_value)); - - if (!_matching_types) - { - if (_operator != "+") && (_operator != "+=") && (_operator != "==") && (_operator != "!=") - { - if (CHATTERBOX_ERROR_ON_MISMATCHED_DATATYPE) - { - __chatterbox_error("Mismatched datatypes"); - } - else - { - __chatterbox_trace("WARNING! Mismatched datatypes"); - } - } - } - - switch(_operator) - { - case "/": if (_both_real) _result = _a_value / _b_value; break; - case "*": if (_both_real) _result = _a_value * _b_value; break; - case "-": if (_both_real) _result = _a_value - _b_value; break; - case "+": - if (_neither_undefined) - { - _result = (_either_string)? (string(_a_value) + string(_b_value)) : (_a_value + _b_value); - } - break; + var _result = undefined; + var _set = false; + + var _both_real = (is_real(_a_value) && is_real(_b_value)); + var _matching_types = (typeof(_a_value) == typeof(_b_value)); + var _either_string = (is_string(_a_value) || is_string(_b_value)); + var _neither_undefined = (!is_undefined(_a_value) && !is_undefined(_b_value)); + + if (!_matching_types) + { + if (_operator != "+") && (_operator != "+=") && (_operator != "==") && (_operator != "!=") + { + if (CHATTERBOX_ERROR_ON_MISMATCHED_DATATYPE) + { + __chatterbox_error("Mismatched datatypes"); + } + else + { + __chatterbox_trace("WARNING! Mismatched datatypes"); + } + } + } + + switch(_operator) + { + case "/": if (_both_real) _result = _a_value / _b_value; break; + case "*": if (_both_real) _result = _a_value * _b_value; break; + case "-": if (_both_real) _result = _a_value - _b_value; break; + case "+": + if (_neither_undefined) + { + _result = (_either_string)? (string(_a_value) + string(_b_value)) : (_a_value + _b_value); + } + break; - case "/=": _set = true; if (_both_real) _result = _a_value / _b_value; break; - case "*=": _set = true; if (_both_real) _result = _a_value * _b_value; break; - case "-=": _set = true; if (_both_real) _result = _a_value - _b_value; break; - case "=": _set = true; _result = _b_value; break; - case "+=": - _set = true; - if (_neither_undefined) - { - _result = (_either_string)? (string(_a_value) + string(_b_value)) : (_a_value + _b_value); - } - break; + case "/=": _set = true; if (_both_real) _result = _a_value / _b_value; break; + case "*=": _set = true; if (_both_real) _result = _a_value * _b_value; break; + case "-=": _set = true; if (_both_real) _result = _a_value - _b_value; break; + case "=": _set = true; _result = _b_value; break; + case "+=": + _set = true; + if (_neither_undefined) + { + _result = (_either_string)? (string(_a_value) + string(_b_value)) : (_a_value + _b_value); + } + break; - case "||": _result = _both_real? (_a_value || _b_value) : false; break; - case "&&": _result = _both_real? (_a_value && _b_value) : false; break; - case ">=": _result = _both_real? (_a_value >= _b_value) : false; break; - case "<=": _result = _both_real? (_a_value <= _b_value) : false; break; - case ">": _result = _both_real? (_a_value > _b_value) : false; break; - case "<": _result = _both_real? (_a_value < _b_value) : false; break; - case "!=": _result = _matching_types? (_a_value != _b_value) : true; break; - case "==": _result = _matching_types? (_a_value == _b_value) : false; break; - } - - if (_set) - { - switch(_a_scope) - { - case CHATTERBOX_SCOPE_INTERNAL: CHATTERBOX_VARIABLES_MAP[? _a ] = _result; break; - case CHATTERBOX_SCOPE_GML_LOCAL: variable_instance_set(id, _a, _result); break; - case CHATTERBOX_SCOPE_GML_GLOBAL: variable_global_set(_a, _result); break; - } - } - - _resolved_array[_element_index] = is_string(_result)? ("\"" + string(_result) + "\"") : string(_result); + case "||": _result = _both_real? (_a_value || _b_value) : false; break; + case "&&": _result = _both_real? (_a_value && _b_value) : false; break; + case ">=": _result = _both_real? (_a_value >= _b_value) : false; break; + case "<=": _result = _both_real? (_a_value <= _b_value) : false; break; + case ">": _result = _both_real? (_a_value > _b_value) : false; break; + case "<": _result = _both_real? (_a_value < _b_value) : false; break; + case "!=": _result = _matching_types? (_a_value != _b_value) : true; break; + case "==": _result = _matching_types? (_a_value == _b_value) : false; break; + } + + if (_set) + { + switch(_a_scope) + { + case CHATTERBOX_SCOPE_INTERNAL: CHATTERBOX_VARIABLES_MAP[? _a ] = _result; break; + case CHATTERBOX_SCOPE_GML_LOCAL: variable_instance_set(id, _a, _result); break; + case CHATTERBOX_SCOPE_GML_GLOBAL: variable_global_set(_a, _result); break; + } + } + + _resolved_array[_element_index] = is_string(_result)? ("\"" + string(_result) + "\"") : string(_result); #endregion - } + } - ds_list_delete(_queue, 0); - } - } -} + ds_list_delete(_queue, 0); + } + } + } + + ds_list_destroy(_queue); -ds_list_destroy(_queue); + return __chatterbox_resolve_value(_chatterbox, _resolved_array[1]); -return __chatterbox_resolve_value(_chatterbox, _resolved_array[1]); \ No newline at end of file + +} diff --git a/scripts/__chatterbox_evaluate/__chatterbox_evaluate.yy b/scripts/__chatterbox_evaluate/__chatterbox_evaluate.yy index a1f5601a..7ea8b125 100644 --- a/scripts/__chatterbox_evaluate/__chatterbox_evaluate.yy +++ b/scripts/__chatterbox_evaluate/__chatterbox_evaluate.yy @@ -1,8 +1,12 @@ { - "id": "5a2bd88b-bb45-42ce-b065-697aa4e45e60", - "modelName": "GMScript", - "mvc": "1.0", - "name": "__chatterbox_evaluate", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "__Private", + "path": "folders/Scripts/Chatterbox/__Private.yy", + }, + "resourceVersion": "1.0", + "name": "__chatterbox_evaluate", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_new_instruction/__chatterbox_new_instruction.gml b/scripts/__chatterbox_new_instruction/__chatterbox_new_instruction.gml index f223ad98..e16fe02d 100644 --- a/scripts/__chatterbox_new_instruction/__chatterbox_new_instruction.gml +++ b/scripts/__chatterbox_new_instruction/__chatterbox_new_instruction.gml @@ -2,27 +2,31 @@ /// @param indent /// @param [content] /// @param [insertPosition] +function __chatterbox_new_instruction() { -var _type = argument[0]; -var _indent = argument[1]; -var _content = (argument_count > 2)? argument[2] : undefined; -var _position = (argument_count > 3)? argument[3] : undefined; + var _type = argument[0]; + var _indent = argument[1]; + var _content = (argument_count > 2)? argument[2] : undefined; + var _position = (argument_count > 3)? argument[3] : undefined; -var _array = array_create(__CHATTERBOX_INSTRUCTION.__SIZE); -_array[__CHATTERBOX_INSTRUCTION.TYPE ] = _type; -_array[__CHATTERBOX_INSTRUCTION.INDENT ] = _indent; -_array[__CHATTERBOX_INSTRUCTION.CONTENT ] = _content; -_array[__CHATTERBOX_INSTRUCTION.BLOCK_END] = undefined; + var _array = array_create(__CHATTERBOX_INSTRUCTION.__SIZE); + _array[__CHATTERBOX_INSTRUCTION.TYPE ] = _type; + _array[__CHATTERBOX_INSTRUCTION.INDENT ] = _indent; + _array[__CHATTERBOX_INSTRUCTION.CONTENT ] = _content; + _array[__CHATTERBOX_INSTRUCTION.BLOCK_END] = undefined; -if (_position != undefined) -{ - ds_list_insert(global.__chatterbox_vm, _position, _array); -} -else -{ - ds_list_insert(global.__chatterbox_vm, global.__chatterbox_insert_pos, _array); - global.__chatterbox_insert_pos++; -} + if (_position != undefined) + { + ds_list_insert(global.__chatterbox_vm, _position, _array); + } + else + { + ds_list_insert(global.__chatterbox_vm, global.__chatterbox_insert_pos, _array); + global.__chatterbox_insert_pos++; + } + + return _array; -return _array; \ No newline at end of file + +} diff --git a/scripts/__chatterbox_new_instruction/__chatterbox_new_instruction.yy b/scripts/__chatterbox_new_instruction/__chatterbox_new_instruction.yy index b127e795..6cf6887c 100644 --- a/scripts/__chatterbox_new_instruction/__chatterbox_new_instruction.yy +++ b/scripts/__chatterbox_new_instruction/__chatterbox_new_instruction.yy @@ -1,8 +1,12 @@ { - "id": "fb0ac65c-2f27-415b-806a-ba3ed448100d", - "modelName": "GMScript", - "mvc": "1.0", - "name": "__chatterbox_new_instruction", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "__Private", + "path": "folders/Scripts/Chatterbox/__Private.yy", + }, + "resourceVersion": "1.0", + "name": "__chatterbox_new_instruction", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_remove_whitespace/__chatterbox_remove_whitespace.gml b/scripts/__chatterbox_remove_whitespace/__chatterbox_remove_whitespace.gml index 5fc34b27..2b49423d 100644 --- a/scripts/__chatterbox_remove_whitespace/__chatterbox_remove_whitespace.gml +++ b/scripts/__chatterbox_remove_whitespace/__chatterbox_remove_whitespace.gml @@ -4,37 +4,41 @@ /// /// @param string /// @param leading +function __chatterbox_remove_whitespace(argument0, argument1) { -var _string = argument0; -var _leading = argument1; + var _string = argument0; + var _leading = argument1; -global.__chatterbox_indent_size = 0; + global.__chatterbox_indent_size = 0; -if (_leading) -{ - var _i = 1; - repeat(string_length(_string)) - { - var _ord = ord(string_char_at(_string, _i)); - if (_ord > 32) break; - if (_ord == 32) global.__chatterbox_indent_size++; - if (_ord == 9) global.__chatterbox_indent_size += CHATTERBOX_INDENT_UNIT_SIZE; - _i++; - } + if (_leading) + { + var _i = 1; + repeat(string_length(_string)) + { + var _ord = ord(string_char_at(_string, _i)); + if (_ord > 32) break; + if (_ord == 32) global.__chatterbox_indent_size++; + if (_ord == 9) global.__chatterbox_indent_size += CHATTERBOX_INDENT_UNIT_SIZE; + _i++; + } - return string_delete(_string, 1, _i-1); -} -else -{ - var _i = string_length(_string); - repeat(string_length(_string)) - { - var _ord = ord(string_char_at(_string, _i)); - if (_ord > 32) break; - if (_ord == 32) global.__chatterbox_indent_size++; - if (_ord == 9) global.__chatterbox_indent_size += CHATTERBOX_INDENT_UNIT_SIZE; - _i--; - } + return string_delete(_string, 1, _i-1); + } + else + { + var _i = string_length(_string); + repeat(string_length(_string)) + { + var _ord = ord(string_char_at(_string, _i)); + if (_ord > 32) break; + if (_ord == 32) global.__chatterbox_indent_size++; + if (_ord == 9) global.__chatterbox_indent_size += CHATTERBOX_INDENT_UNIT_SIZE; + _i--; + } - return string_copy(_string, 1, _i); -} \ No newline at end of file + return string_copy(_string, 1, _i); + } + + +} diff --git a/scripts/__chatterbox_remove_whitespace/__chatterbox_remove_whitespace.yy b/scripts/__chatterbox_remove_whitespace/__chatterbox_remove_whitespace.yy index d03fdf0e..fa8c8f28 100644 --- a/scripts/__chatterbox_remove_whitespace/__chatterbox_remove_whitespace.yy +++ b/scripts/__chatterbox_remove_whitespace/__chatterbox_remove_whitespace.yy @@ -1,8 +1,12 @@ { - "id": "f7061cd5-abb7-47d5-9afb-0c61c4101a56", - "modelName": "GMScript", - "mvc": "1.0", - "name": "__chatterbox_remove_whitespace", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "__Private", + "path": "folders/Scripts/Chatterbox/__Private.yy", + }, + "resourceVersion": "1.0", + "name": "__chatterbox_remove_whitespace", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_resolve_value/__chatterbox_resolve_value.gml b/scripts/__chatterbox_resolve_value/__chatterbox_resolve_value.gml index 92e35695..6b9ba9c4 100644 --- a/scripts/__chatterbox_resolve_value/__chatterbox_resolve_value.gml +++ b/scripts/__chatterbox_resolve_value/__chatterbox_resolve_value.gml @@ -4,218 +4,222 @@ /// /// @param chatterboxHost /// @param value +function __chatterbox_resolve_value(argument0, argument1) { -global.__chatterbox_scope = CHATTERBOX_SCOPE_INVALID; -global.__chatterbox_variable_name = __CHATTERBOX_VARIABLE_INVALID; + global.__chatterbox_scope = CHATTERBOX_SCOPE_INVALID; + global.__chatterbox_variable_name = __CHATTERBOX_VARIABLE_INVALID; -var _chatterbox = argument0; _chatterbox = _chatterbox; //Stop "only used once error" -var _value = argument1; + var _chatterbox = argument0; _chatterbox = _chatterbox; //Stop "only used once error" + var _value = argument1; -if (is_real(_value)) -{ - //It's a real! -} -else if (string_char_at(_value, 1) == "\"") && (string_char_at(_value, string_length(_value)) == "\"") -{ - //It's a string! - _value = string_copy(_value, 2, string_length(_value)-2); -} -else -{ - var _variable = false; + if (is_real(_value)) + { + //It's a real! + } + else if (string_char_at(_value, 1) == "\"") && (string_char_at(_value, string_length(_value)) == "\"") + { + //It's a string! + _value = string_copy(_value, 2, string_length(_value)-2); + } + else + { + var _variable = false; #region Figure out if this value is a real - var _hit_number = false; - var _j = string_length(_value); - repeat(string_length(_value)) - { - var _character = string_char_at(_value, _j); - if (_character == "0") || (_character == "1") || (_character == "2") || (_character == "3") - || (_character == "4") || (_character == "5") || (_character == "6") || (_character == "7") - || (_character == "8") || (_character == "9") || (_character == ".") || (_character == "-") - { - _hit_number = true; - } - else - { - _variable = true; - break; - } - _j--; - } + var _hit_number = false; + var _j = string_length(_value); + repeat(string_length(_value)) + { + var _character = string_char_at(_value, _j); + if (_character == "0") || (_character == "1") || (_character == "2") || (_character == "3") + || (_character == "4") || (_character == "5") || (_character == "6") || (_character == "7") + || (_character == "8") || (_character == "9") || (_character == ".") || (_character == "-") + { + _hit_number = true; + } + else + { + _variable = true; + break; + } + _j--; + } - if (!_variable) - { - if (string_count("-", _value) > 1) _variable = true; - if (string_count(".", _value) > 1) _variable = true; + if (!_variable) + { + if (string_count("-", _value) > 1) _variable = true; + if (string_count(".", _value) > 1) _variable = true; - var _negative_pos = string_pos("-", _value); - if (_negative_pos > 1) _variable = true; - if (string_pos(".", _value) == (1+_negative_pos)) _variable = true; + var _negative_pos = string_pos("-", _value); + if (_negative_pos > 1) _variable = true; + if (string_pos(".", _value) == (1+_negative_pos)) _variable = true; - if (!_variable) _value = real(_value); - } + if (!_variable) _value = real(_value); + } #endregion #region Figure out if this value is a keyword: true / false / undefined / null - if (_variable) - { - if (_value == "true") - { - _value = true; - _variable = false; - } - else if (_value == "false") - { - _value = false; - _variable = false; - } - else if (_value == "undefined") || (_value == "null") - { - _value = undefined; - _variable = false; - } - } + if (_variable) + { + if (_value == "true") + { + _value = true; + _variable = false; + } + else if (_value == "false") + { + _value = false; + _variable = false; + } + else if (_value == "undefined") || (_value == "null") + { + _value = undefined; + _variable = false; + } + } #endregion - if (_variable) - { + if (_variable) + { #region Find the variable's scope based on prefix - var _scope = CHATTERBOX_NAKED_VARIABLE_SCOPE; + var _scope = CHATTERBOX_NAKED_VARIABLE_SCOPE; - if (string_char_at(_value, 1) == "$") - { - _scope = CHATTERBOX_DOLLAR_VARIABLE_SCOPE; - _value = string_delete(_value, 1, 1); - } - else if (string_copy(_value, 1, 2) == "g.") - { - _scope = CHATTERBOX_SCOPE_GML_GLOBAL; - _value = string_delete(_value, 1, 2); - } - else if (string_copy(_value, 1, 7) == "global.") - { - _scope = CHATTERBOX_SCOPE_GML_GLOBAL; - _value = string_delete(_value, 1, 7); - } - else if (string_copy(_value, 1, 2) == "l.") - { - _scope = CHATTERBOX_SCOPE_GML_LOCAL; - _value = string_delete(_value, 1, 2); - } - else if (string_copy(_value, 1, 6) == "local.") - { - _scope = CHATTERBOX_SCOPE_GML_LOCAL; - _value = string_delete(_value, 1, 6); - } - else if (string_copy(_value, 1, 2) == "i.") - { - _scope = CHATTERBOX_SCOPE_INTERNAL; - _value = string_delete(_value, 1, 2); - } - else if (string_copy(_value, 1, 9) == "internal.") - { - _scope = CHATTERBOX_SCOPE_INTERNAL; - _value = string_delete(_value, 1, 9); - } + if (string_char_at(_value, 1) == "$") + { + _scope = CHATTERBOX_DOLLAR_VARIABLE_SCOPE; + _value = string_delete(_value, 1, 1); + } + else if (string_copy(_value, 1, 2) == "g.") + { + _scope = CHATTERBOX_SCOPE_GML_GLOBAL; + _value = string_delete(_value, 1, 2); + } + else if (string_copy(_value, 1, 7) == "global.") + { + _scope = CHATTERBOX_SCOPE_GML_GLOBAL; + _value = string_delete(_value, 1, 7); + } + else if (string_copy(_value, 1, 2) == "l.") + { + _scope = CHATTERBOX_SCOPE_GML_LOCAL; + _value = string_delete(_value, 1, 2); + } + else if (string_copy(_value, 1, 6) == "local.") + { + _scope = CHATTERBOX_SCOPE_GML_LOCAL; + _value = string_delete(_value, 1, 6); + } + else if (string_copy(_value, 1, 2) == "i.") + { + _scope = CHATTERBOX_SCOPE_INTERNAL; + _value = string_delete(_value, 1, 2); + } + else if (string_copy(_value, 1, 9) == "internal.") + { + _scope = CHATTERBOX_SCOPE_INTERNAL; + _value = string_delete(_value, 1, 9); + } - global.__chatterbox_scope = _scope; - global.__chatterbox_variable_name = _value; + global.__chatterbox_scope = _scope; + global.__chatterbox_variable_name = _value; #endregion #region Collect variable value depending on scope and check its datatype - switch(_scope) - { - case CHATTERBOX_SCOPE_INTERNAL: - if (!ds_map_exists(CHATTERBOX_VARIABLES_MAP, _value)) - { - if (CHATTERBOX_ERROR_ON_MISSING_VARIABLE) - { - __chatterbox_error("Internal variable \"" + _value + "\" doesn't exist"); - } - else - { - __chatterbox_trace("WARNING! Internal variable \"" + _value + "\" doesn't exist"); - } + switch(_scope) + { + case CHATTERBOX_SCOPE_INTERNAL: + if (!ds_map_exists(CHATTERBOX_VARIABLES_MAP, _value)) + { + if (CHATTERBOX_ERROR_ON_MISSING_VARIABLE) + { + __chatterbox_error("Internal variable \"" + _value + "\" doesn't exist"); + } + else + { + __chatterbox_trace("WARNING! Internal variable \"" + _value + "\" doesn't exist"); + } - _value = CHATTERBOX_DEFAULT_VARIABLE_VALUE; - } - else - { - _value = CHATTERBOX_VARIABLES_MAP[? _value ]; - } - break; + _value = CHATTERBOX_DEFAULT_VARIABLE_VALUE; + } + else + { + _value = CHATTERBOX_VARIABLES_MAP[? _value ]; + } + break; - case CHATTERBOX_SCOPE_GML_LOCAL: - if (!variable_instance_exists(id, _value)) - { - if (CHATTERBOX_ERROR_ON_MISSING_VARIABLE) - { - __chatterbox_error("Local variable \"" + _value + "\" doesn't exist"); - } - else - { - __chatterbox_trace("WARNING! Local variable \"" + _value + "\" doesn't exist"); - } + case CHATTERBOX_SCOPE_GML_LOCAL: + if (!variable_instance_exists(id, _value)) + { + if (CHATTERBOX_ERROR_ON_MISSING_VARIABLE) + { + __chatterbox_error("Local variable \"" + _value + "\" doesn't exist"); + } + else + { + __chatterbox_trace("WARNING! Local variable \"" + _value + "\" doesn't exist"); + } - _value = CHATTERBOX_DEFAULT_VARIABLE_VALUE; - } - else - { - _value = variable_instance_get(id, _value); - } - break; + _value = CHATTERBOX_DEFAULT_VARIABLE_VALUE; + } + else + { + _value = variable_instance_get(id, _value); + } + break; - case CHATTERBOX_SCOPE_GML_GLOBAL: - if (!variable_global_exists(_value)) - { - if (CHATTERBOX_ERROR_ON_MISSING_VARIABLE) - { - __chatterbox_error("Global variable \"" + _value + "\" doesn't exist!"); - } - else - { - __chatterbox_trace("WARNING! Global variable \"" + _value + "\" doesn't exist"); - } + case CHATTERBOX_SCOPE_GML_GLOBAL: + if (!variable_global_exists(_value)) + { + if (CHATTERBOX_ERROR_ON_MISSING_VARIABLE) + { + __chatterbox_error("Global variable \"" + _value + "\" doesn't exist!"); + } + else + { + __chatterbox_trace("WARNING! Global variable \"" + _value + "\" doesn't exist"); + } - _value = CHATTERBOX_DEFAULT_VARIABLE_VALUE; - } - else - { - _value = variable_global_get(_value); - } - break; - } + _value = CHATTERBOX_DEFAULT_VARIABLE_VALUE; + } + else + { + _value = variable_global_get(_value); + } + break; + } - var _typeof = typeof(_value); - if (_typeof == "array") || (_typeof == "ptr") || (_typeof == "null") || (_typeof == "vec3") || (_typeof == "vec4") - { - if (CHATTERBOX_ERROR_ON_INVALID_DATATYPE) - { - __chatterbox_error("Variable \"" + _value + "\" has an unsupported datatype (" + _typeof + ")"); - } - else - { - __chatterbox_trace("WARNING! Variable \"" + _value + "\" has an unsupported datatype (" + _typeof + ")"); - } + var _typeof = typeof(_value); + if (_typeof == "array") || (_typeof == "ptr") || (_typeof == "null") || (_typeof == "vec3") || (_typeof == "vec4") + { + if (CHATTERBOX_ERROR_ON_INVALID_DATATYPE) + { + __chatterbox_error("Variable \"" + _value + "\" has an unsupported datatype (" + _typeof + ")"); + } + else + { + __chatterbox_trace("WARNING! Variable \"" + _value + "\" has an unsupported datatype (" + _typeof + ")"); + } - _value = string(_value); - } + _value = string(_value); + } - if (_typeof == "bool") || (_typeof == "int32") || (_typeof == "int64") - { - _value = real(_value); - } + if (_typeof == "bool") || (_typeof == "int32") || (_typeof == "int64") + { + _value = real(_value); + } #endregion - } -} + } + } -return _value; \ No newline at end of file + return _value; + + +} diff --git a/scripts/__chatterbox_resolve_value/__chatterbox_resolve_value.yy b/scripts/__chatterbox_resolve_value/__chatterbox_resolve_value.yy index e1b2c98b..04ee62e7 100644 --- a/scripts/__chatterbox_resolve_value/__chatterbox_resolve_value.yy +++ b/scripts/__chatterbox_resolve_value/__chatterbox_resolve_value.yy @@ -1,8 +1,12 @@ { - "id": "60990149-1dae-4f22-88d9-53025cbd7878", - "modelName": "GMScript", - "mvc": "1.0", - "name": "__chatterbox_resolve_value", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "__Private", + "path": "folders/Scripts/Chatterbox/__Private.yy", + }, + "resourceVersion": "1.0", + "name": "__chatterbox_resolve_value", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_string/__chatterbox_string.gml b/scripts/__chatterbox_string/__chatterbox_string.gml index 062afe0d..f37bdc03 100644 --- a/scripts/__chatterbox_string/__chatterbox_string.gml +++ b/scripts/__chatterbox_string/__chatterbox_string.gml @@ -1,4 +1,8 @@ /// @param value +function __chatterbox_string(argument0) { -if (is_array(argument0)) return __chatterbox_array_to_string(argument0); -return string(argument0); \ No newline at end of file + if (is_array(argument0)) return __chatterbox_array_to_string(argument0); + return string(argument0); + + +} diff --git a/scripts/__chatterbox_string/__chatterbox_string.yy b/scripts/__chatterbox_string/__chatterbox_string.yy index 61b27af4..3eea989a 100644 --- a/scripts/__chatterbox_string/__chatterbox_string.yy +++ b/scripts/__chatterbox_string/__chatterbox_string.yy @@ -1,8 +1,12 @@ { - "id": "e808db90-cb59-47eb-bd8f-ff2d1072801a", - "modelName": "GMScript", - "mvc": "1.0", - "name": "__chatterbox_string", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "__Private", + "path": "folders/Scripts/Chatterbox/__Private.yy", + }, + "resourceVersion": "1.0", + "name": "__chatterbox_string", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_syntax/__chatterbox_syntax.gml b/scripts/__chatterbox_syntax/__chatterbox_syntax.gml index 6f1a4879..033591b3 100644 --- a/scripts/__chatterbox_syntax/__chatterbox_syntax.gml +++ b/scripts/__chatterbox_syntax/__chatterbox_syntax.gml @@ -261,4 +261,5 @@ /// geq | >= | Greater-than-or-equal-to /// eq | == | Equal to /// is | == | Equal to -/// neq | != | Not equal to \ No newline at end of file +/// neq | != | Not equal to + diff --git a/scripts/__chatterbox_syntax/__chatterbox_syntax.yy b/scripts/__chatterbox_syntax/__chatterbox_syntax.yy index e0af8ab3..3e68d111 100644 --- a/scripts/__chatterbox_syntax/__chatterbox_syntax.yy +++ b/scripts/__chatterbox_syntax/__chatterbox_syntax.yy @@ -1,8 +1,12 @@ { - "id": "25021e7e-8142-4fbb-8f3f-aeefd5d03271", - "modelName": "GMScript", - "mvc": "1.0", - "name": "__chatterbox_syntax", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Chatterbox", + "path": "folders/Scripts/Chatterbox.yy", + }, + "resourceVersion": "1.0", + "name": "__chatterbox_syntax", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_tokenize_action/__chatterbox_tokenize_action.gml b/scripts/__chatterbox_tokenize_action/__chatterbox_tokenize_action.gml index 234b19bf..3aeb2a39 100644 --- a/scripts/__chatterbox_tokenize_action/__chatterbox_tokenize_action.gml +++ b/scripts/__chatterbox_tokenize_action/__chatterbox_tokenize_action.gml @@ -1,340 +1,344 @@ /// @param string +function __chatterbox_tokenize_action(argument0) { -var _string = argument0; + var _string = argument0; -var _content = []; + var _content = []; -if ((_string == "end if") || (_string == "elseif") || (_string == "else if")) -{ - if (CHATTERBOX_ERROR_ON_NONSTANDARD_SYNTAX) __chatterbox_error("<<" + _string + ">> is non-standard Yarn syntax, please use <>\n \n(Set CHATTERBOX_ERROR_ON_NONSTANDARD_SYNTAX to to hide this error)"); - _content[0] = _string; -} -else -{ + if ((_string == "end if") || (_string == "elseif") || (_string == "else if")) + { + if (CHATTERBOX_ERROR_ON_NONSTANDARD_SYNTAX) __chatterbox_error("<<" + _string + ">> is non-standard Yarn syntax, please use <>\n \n(Set CHATTERBOX_ERROR_ON_NONSTANDARD_SYNTAX to to hide this error)"); + _content[0] = _string; + } + else + { #region Break down string into tokens - var _in_string = false; - var _in_symbol = false; + var _in_string = false; + var _in_symbol = false; - _string += " "; - var _work_length = string_length(_string); - var _work_char = ""; - var _work_char_prev = ""; - var _work_read_prev = 1; - for(var _work_read = 1; _work_read <= _work_length; _work_read++) - { - var _read = false; - var _read_add_char = 0; - var _read_parse_operator = false; + _string += " "; + var _work_length = string_length(_string); + var _work_char = ""; + var _work_char_prev = ""; + var _work_read_prev = 1; + for(var _work_read = 1; _work_read <= _work_length; _work_read++) + { + var _read = false; + var _read_add_char = 0; + var _read_parse_operator = false; - _work_char_prev = _work_char; - var _work_char = string_char_at(_string, _work_read); + _work_char_prev = _work_char; + var _work_char = string_char_at(_string, _work_read); - if (_in_string) - { - //Ignore all behaviours until we hit a quote mark - if (_work_char == "\"") && (_work_char_prev != "\\") - { - _read_add_char = 1; //Make sure we get the quote mark in the string - _in_string = false; - _read = true; - //show_debug_message(" found closing quote mark"); - } - } - else if (_work_char == "\"") && (_work_char_prev != "\\") - { - //If we've got an unescaped quote mark, start a string - _in_string = true; - _read = true; - //show_debug_message(" found open quote mark"); - } - else if (_work_char == "!") - || (_work_char == "=") - || (_work_char == "<") - || (_work_char == ">") - || (_work_char == "+") - || (_work_char == "-") - || (_work_char == "*") - || (_work_char == "/") - || (_work_char == "&") - || (_work_char == "|") - || (_work_char == "^") - || (_work_char == "`") - { - if (!_in_symbol) - { - //If we've found an operator symbol then do a standard read and begin reading a symbol - _in_symbol = true; - _read = true; - //show_debug_message(" found symbol start"); - } - } - else if (_in_symbol) - { - //If we're reading a symbol but this character *isn't* a symbol character, do a read - _in_symbol = false; - _read = true; - _read_parse_operator = true; - //show_debug_message(" found symbol end"); - } - else if (_work_char == " ") - || (_work_char == ",") - { - //Always read at spaces and commas - _read = true; - //show_debug_message(" found space or comma"); - } - else if (_work_char == "(") || (_work_char == ")") - { - //Always read at brackets - _read = true; - //show_debug_message(" found bracket"); - } - else if (_work_char_prev == "(") || (_work_char_prev == ")") - { - //Always read at brackets - _read = true; - //show_debug_message(" found bracket pt.2"); - } + if (_in_string) + { + //Ignore all behaviours until we hit a quote mark + if (_work_char == "\"") && (_work_char_prev != "\\") + { + _read_add_char = 1; //Make sure we get the quote mark in the string + _in_string = false; + _read = true; + //show_debug_message(" found closing quote mark"); + } + } + else if (_work_char == "\"") && (_work_char_prev != "\\") + { + //If we've got an unescaped quote mark, start a string + _in_string = true; + _read = true; + //show_debug_message(" found open quote mark"); + } + else if (_work_char == "!") + || (_work_char == "=") + || (_work_char == "<") + || (_work_char == ">") + || (_work_char == "+") + || (_work_char == "-") + || (_work_char == "*") + || (_work_char == "/") + || (_work_char == "&") + || (_work_char == "|") + || (_work_char == "^") + || (_work_char == "`") + { + if (!_in_symbol) + { + //If we've found an operator symbol then do a standard read and begin reading a symbol + _in_symbol = true; + _read = true; + //show_debug_message(" found symbol start"); + } + } + else if (_in_symbol) + { + //If we're reading a symbol but this character *isn't* a symbol character, do a read + _in_symbol = false; + _read = true; + _read_parse_operator = true; + //show_debug_message(" found symbol end"); + } + else if (_work_char == " ") + || (_work_char == ",") + { + //Always read at spaces and commas + _read = true; + //show_debug_message(" found space or comma"); + } + else if (_work_char == "(") || (_work_char == ")") + { + //Always read at brackets + _read = true; + //show_debug_message(" found bracket"); + } + else if (_work_char_prev == "(") || (_work_char_prev == ")") + { + //Always read at brackets + _read = true; + //show_debug_message(" found bracket pt.2"); + } - if (_read) - { - var _out_string = string_copy(_string, _work_read_prev, _work_read + _read_add_char - _work_read_prev); - //show_debug_message(" copied \"" + _out_string + "\""); - _out_string = __chatterbox_remove_whitespace(_out_string, true); - _out_string = __chatterbox_remove_whitespace(_out_string, false); - _out_string = string_replace_all(_out_string, "\\\"", "\""); //Replace \" with " + if (_read) + { + var _out_string = string_copy(_string, _work_read_prev, _work_read + _read_add_char - _work_read_prev); + //show_debug_message(" copied \"" + _out_string + "\""); + _out_string = __chatterbox_remove_whitespace(_out_string, true); + _out_string = __chatterbox_remove_whitespace(_out_string, false); + _out_string = string_replace_all(_out_string, "\\\"", "\""); //Replace \" with " - switch(_out_string) - { - case "and": _out_string = "&&"; break; - case "&" : _out_string = "&&"; break; - case "le" : _out_string = "<"; break; - case "gt" : _out_string = ">"; break; - case "or" : _out_string = "||"; break; - case "`" : _out_string = "||"; break; - case "|" : _out_string = "||"; break; - case "leq": _out_string = "<="; break; - case "geq": _out_string = ">="; break; - case "eq" : _out_string = "=="; break; - case "is" : _out_string = "=="; break; - case "neq": _out_string = "!="; break; - case "to" : _out_string = "="; break; - case "not": _out_string = "!"; break; - } + switch(_out_string) + { + case "and": _out_string = "&&"; break; + case "&" : _out_string = "&&"; break; + case "le" : _out_string = "<"; break; + case "gt" : _out_string = ">"; break; + case "or" : _out_string = "||"; break; + case "`" : _out_string = "||"; break; + case "|" : _out_string = "||"; break; + case "leq": _out_string = "<="; break; + case "geq": _out_string = ">="; break; + case "eq" : _out_string = "=="; break; + case "is" : _out_string = "=="; break; + case "neq": _out_string = "!="; break; + case "to" : _out_string = "="; break; + case "not": _out_string = "!"; break; + } - if (_out_string != "") - { - _content[array_length_1d(_content)] = _out_string; - if (array_length_1d(_content) == 1) - { - _content[1] = undefined; //Reserve a slot for the top-level node in the evaluation tree - _content[2] = "()"; //Reserve a slot for the generic function token - } - } + if (_out_string != "") + { + _content[array_length_1d(_content)] = _out_string; + if (array_length_1d(_content) == 1) + { + _content[1] = undefined; //Reserve a slot for the top-level node in the evaluation tree + _content[2] = "()"; //Reserve a slot for the generic function token + } + } - _work_read_prev = _work_read + _read_add_char; - } - } + _work_read_prev = _work_read + _read_add_char; + } + } #endregion #region BUild evaluation tree - var _content_length = array_length_1d(_content); - var _eval_tree_root = array_create(_content_length-3); - for(var _i = 3; _i < _content_length; _i++) _eval_tree_root[_i-3] = _i; - _content[1] = _eval_tree_root; - _content[2] = "()"; + var _content_length = array_length_1d(_content); + var _eval_tree_root = array_create(_content_length-3); + for(var _i = 3; _i < _content_length; _i++) _eval_tree_root[_i-3] = _i; + _content[1] = _eval_tree_root; + _content[2] = "()"; - var _queue = ds_list_create(); - ds_list_add(_queue, 1); + var _queue = ds_list_create(); + ds_list_add(_queue, 1); - repeat(9999) - { - if (ds_list_empty(_queue)) break; + repeat(9999) + { + if (ds_list_empty(_queue)) break; - var _element_index = _queue[| 0]; - ds_list_delete(_queue, 0); + var _element_index = _queue[| 0]; + ds_list_delete(_queue, 0); - var _element = _content[_element_index]; - if (!is_array(_element)) continue; - var _element_length = array_length_1d(_element); + var _element = _content[_element_index]; + if (!is_array(_element)) continue; + var _element_length = array_length_1d(_element); - var _break = false; - for(var _op = 0; _op < global.__chatterbox_op_count; _op++) - { - var _operator = global.__chatterbox_op_list[| _op]; + var _break = false; + for(var _op = 0; _op < global.__chatterbox_op_count; _op++) + { + var _operator = global.__chatterbox_op_list[| _op]; - for(var _e = _element_length-1; _e > 0; _e--) //Go backwards. This solves issues with nested brackets - { - var _value = _content[_element[_e]]; + for(var _e = _element_length-1; _e > 0; _e--) //Go backwards. This solves issues with nested brackets + { + var _value = _content[_element[_e]]; - if (_value == _operator) - { - if (_operator == "(") - { + if (_value == _operator) + { + if (_operator == "(") + { #region Split up bracketed expressions - //Find the first close bracket token - for(var _f = _e+1; _f < _element_length; _f++) if (_content[_element[_f]] == ")") break; + //Find the first close bracket token + for(var _f = _e+1; _f < _element_length; _f++) if (_content[_element[_f]] == ")") break; - if (_f < _element_length) - { - var _function = undefined; - if (_e > 0) - { - _function = _content[_element[_e-1]]; - if (!is_string(_function) || (_function == "()") || (ds_list_find_index(global.__chatterbox_op_list, _function) >= 0)) _function = undefined; - } + if (_f < _element_length) + { + var _function = undefined; + if (_e > 0) + { + _function = _content[_element[_e-1]]; + if (!is_string(_function) || (_function == "()") || (ds_list_find_index(global.__chatterbox_op_list, _function) >= 0)) _function = undefined; + } - if (_function == undefined) - { - //Standard "structural" bracket + if (_function == undefined) + { + //Standard "structural" bracket - var _new_element = []; - array_copy(_new_element, 0, _element, _e+1, _f-_e-1); + var _new_element = []; + array_copy(_new_element, 0, _element, _e+1, _f-_e-1); - _content[array_length_1d(_content)] = _new_element; //Add the new sub-array to the overall content array - ds_list_add(_queue, array_length_1d(_content)-1); //Add the index of the new sub-array to the processing queue + _content[array_length_1d(_content)] = _new_element; //Add the new sub-array to the overall content array + ds_list_add(_queue, array_length_1d(_content)-1); //Add the index of the new sub-array to the processing queue - _replacement_element = array_create(_element_length + _e - _f); //Create a new element array - array_copy(_replacement_element, 0, _element, 0, _e); - _replacement_element[_e] = array_length_1d(_content)-1; //Set the index of the new sub-array in the replacement element array - array_copy(_replacement_element, _e+1, _element, _f+1, _element_length-_f); + _replacement_element = array_create(_element_length + _e - _f); //Create a new element array + array_copy(_replacement_element, 0, _element, 0, _e); + _replacement_element[_e] = array_length_1d(_content)-1; //Set the index of the new sub-array in the replacement element array + array_copy(_replacement_element, _e+1, _element, _f+1, _element_length-_f); - _content[_element_index] = _replacement_element; - ds_list_add(_queue, _element_index); //Add the index of the replacement array to the processing queue - } - else - { - //Function call + _content[_element_index] = _replacement_element; + ds_list_add(_queue, _element_index); //Add the index of the replacement array to the processing queue + } + else + { + //Function call - var _new_element = [_element[_e-1], 2]; - array_copy(_new_element, 2, _element, _e+1, _f-_e-1); + var _new_element = [_element[_e-1], 2]; + array_copy(_new_element, 2, _element, _e+1, _f-_e-1); - _content[array_length_1d(_content)] = _new_element; //Add the new sub-array to the overall content array - ds_list_add(_queue, array_length_1d(_content)-1); //Add the index of the new sub-array to the processing queue + _content[array_length_1d(_content)] = _new_element; //Add the new sub-array to the overall content array + ds_list_add(_queue, array_length_1d(_content)-1); //Add the index of the new sub-array to the processing queue - _replacement_element = array_create(_element_length - 1 + _e - _f); //Create a new element array - array_copy(_replacement_element, 0, _element, 0, _e-1); - _replacement_element[_e-1] = array_length_1d(_content)-1; //Set the index of the new sub-array in the replacement element array - array_copy(_replacement_element, _e+1, _element, _f+1, _element_length-_f); + _replacement_element = array_create(_element_length - 1 + _e - _f); //Create a new element array + array_copy(_replacement_element, 0, _element, 0, _e-1); + _replacement_element[_e-1] = array_length_1d(_content)-1; //Set the index of the new sub-array in the replacement element array + array_copy(_replacement_element, _e+1, _element, _f+1, _element_length-_f); - _content[_element_index] = _replacement_element; - ds_list_add(_queue, _element_index); //Add the index of the replacement array to the processing queue - } - } - else - { - //Error! - __chatterbox_error("Syntax error"); - _content[_element_index] = undefined; - } + _content[_element_index] = _replacement_element; + ds_list_add(_queue, _element_index); //Add the index of the replacement array to the processing queue + } + } + else + { + //Error! + __chatterbox_error("Syntax error"); + _content[_element_index] = undefined; + } #endregion - } - else if (_operator == "!") || ((_operator == "-") && (_op == global.__chatterbox_negative_op_index)) - { + } + else if (_operator == "!") || ((_operator == "-") && (_op == global.__chatterbox_negative_op_index)) + { #region Unary operators - if (_e < _element_length-1) //For a unary operator, we cannot be the last element - { - var _new_element = []; - array_copy(_new_element, 0, _element, _e, 2); + if (_e < _element_length-1) //For a unary operator, we cannot be the last element + { + var _new_element = []; + array_copy(_new_element, 0, _element, _e, 2); - _content[array_length_1d(_content)] = _new_element; //Add the new sub-array to the overall content array - ds_list_add(_queue, array_length_1d(_content)-1); //Add the index of the new sub-array to the processing queue + _content[array_length_1d(_content)] = _new_element; //Add the new sub-array to the overall content array + ds_list_add(_queue, array_length_1d(_content)-1); //Add the index of the new sub-array to the processing queue - _replacement_element = array_create(_element_length-1); //Create a new element array - array_copy(_replacement_element, 0, _element, 0, _e); - _replacement_element[_e] = array_length_1d(_content)-1; //Set the index of the new sub-array in the replacement element array - array_copy(_replacement_element, _e+1, _element, _e+2, _element_length-(_e+2)); + _replacement_element = array_create(_element_length-1); //Create a new element array + array_copy(_replacement_element, 0, _element, 0, _e); + _replacement_element[_e] = array_length_1d(_content)-1; //Set the index of the new sub-array in the replacement element array + array_copy(_replacement_element, _e+1, _element, _e+2, _element_length-(_e+2)); - _content[_element_index] = _replacement_element; - ds_list_add(_queue, _element_index); //Add the index of the replacement array to the processing queue - } - else - { - //Error! - __chatterbox_error("Syntax error"); - _content[_element_index] = undefined; - } + _content[_element_index] = _replacement_element; + ds_list_add(_queue, _element_index); //Add the index of the replacement array to the processing queue + } + else + { + //Error! + __chatterbox_error("Syntax error"); + _content[_element_index] = undefined; + } #endregion - } - else - { + } + else + { #region Binary operators - if (_element_length < 3) //For a binary operator, we need at least three tokens in the array - { - if !((_operator == "-") && (_op == 8) && (_e == 0)) //Don't report this error if the subtraction sign might be a negative sign - { - //Error! - __chatterbox_error("Syntax error"); - _content[_element_index] = undefined; - } - } - else if (_e <= 0) || (_e >= _element_length-1) //A binary operator must be in-between two tokens - { - if !((_operator == "-") && (_op == 8) && (_e == 0)) //Don't report this error if the subtraction sign might be a negative sign - { - //Error! - __chatterbox_error("Syntax error"); - _content[_element_index] = undefined; - } - } - else if (_element_length > 3) - { - var _replacement_element = [_element[0], - _element[_e], - _element[_element_length-1]]; + if (_element_length < 3) //For a binary operator, we need at least three tokens in the array + { + if !((_operator == "-") && (_op == 8) && (_e == 0)) //Don't report this error if the subtraction sign might be a negative sign + { + //Error! + __chatterbox_error("Syntax error"); + _content[_element_index] = undefined; + } + } + else if (_e <= 0) || (_e >= _element_length-1) //A binary operator must be in-between two tokens + { + if !((_operator == "-") && (_op == 8) && (_e == 0)) //Don't report this error if the subtraction sign might be a negative sign + { + //Error! + __chatterbox_error("Syntax error"); + _content[_element_index] = undefined; + } + } + else if (_element_length > 3) + { + var _replacement_element = [_element[0], + _element[_e], + _element[_element_length-1]]; - //Split up the left-hand side of the array - if (_e > 1) - { - var _new_element = []; - array_copy(_new_element, 0, _element, 0, _e); + //Split up the left-hand side of the array + if (_e > 1) + { + var _new_element = []; + array_copy(_new_element, 0, _element, 0, _e); - _content[array_length_1d(_content)] = _new_element; //Add the new sub-array to the overall content array - ds_list_add(_queue, array_length_1d(_content)-1); //Add the index of the new sub-array to the processing queue - _replacement_element[0] = array_length_1d(_content)-1; //Set the index of the new sub-array in the replacement element array - } + _content[array_length_1d(_content)] = _new_element; //Add the new sub-array to the overall content array + ds_list_add(_queue, array_length_1d(_content)-1); //Add the index of the new sub-array to the processing queue + _replacement_element[0] = array_length_1d(_content)-1; //Set the index of the new sub-array in the replacement element array + } - //Split up the right-hand side of the array - if (_e < _element_length-2) - { - var _new_element = []; - array_copy(_new_element, 0, _element, _e+1, _element_length-_e-1); + //Split up the right-hand side of the array + if (_e < _element_length-2) + { + var _new_element = []; + array_copy(_new_element, 0, _element, _e+1, _element_length-_e-1); - _content[array_length_1d(_content)] = _new_element; //Add the new sub-array to the overall content array - ds_list_add(_queue, array_length_1d(_content)-1); //Add the index of the new sub-array to the processing queue - _replacement_element[2] = array_length_1d(_content)-1; //Set the index of the new sub-array in the replacement element array - } + _content[array_length_1d(_content)] = _new_element; //Add the new sub-array to the overall content array + ds_list_add(_queue, array_length_1d(_content)-1); //Add the index of the new sub-array to the processing queue + _replacement_element[2] = array_length_1d(_content)-1; //Set the index of the new sub-array in the replacement element array + } - _content[_element_index] = _replacement_element; - } - else - { - //No action needed - } + _content[_element_index] = _replacement_element; + } + else + { + //No action needed + } #endregion - } + } - _break = true; - break; - } - } + _break = true; + break; + } + } - if (_break) break; - } - } + if (_break) break; + } + } - ds_list_destroy(_queue); + ds_list_destroy(_queue); #endregion -} + } + + return _content; -return _content; \ No newline at end of file + +} diff --git a/scripts/__chatterbox_tokenize_action/__chatterbox_tokenize_action.yy b/scripts/__chatterbox_tokenize_action/__chatterbox_tokenize_action.yy index 00ebfd55..3c45dddb 100644 --- a/scripts/__chatterbox_tokenize_action/__chatterbox_tokenize_action.yy +++ b/scripts/__chatterbox_tokenize_action/__chatterbox_tokenize_action.yy @@ -1,8 +1,12 @@ { - "id": "211c822a-303c-4c26-ad78-e2435f3a28a2", - "modelName": "GMScript", - "mvc": "1.0", - "name": "__chatterbox_tokenize_action", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "__Private", + "path": "folders/Scripts/Chatterbox/__Private.yy", + }, + "resourceVersion": "1.0", + "name": "__chatterbox_tokenize_action", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_trace/__chatterbox_trace.gml b/scripts/__chatterbox_trace/__chatterbox_trace.gml index 2e4f22a6..45af6d4a 100644 --- a/scripts/__chatterbox_trace/__chatterbox_trace.gml +++ b/scripts/__chatterbox_trace/__chatterbox_trace.gml @@ -1,14 +1,18 @@ /// @param [value...] +function __chatterbox_trace() { -var _string = ""; + var _string = ""; -var _i = 0; -repeat(argument_count) -{ - _string += __chatterbox_string(argument[_i]); - ++_i; -} + var _i = 0; + repeat(argument_count) + { + _string += __chatterbox_string(argument[_i]); + ++_i; + } + + show_debug_message(string_format(current_time, 8, 0) + " Chatterbox: " + _string); -show_debug_message(string_format(current_time, 8, 0) + " Chatterbox: " + _string); + return _string; -return _string; \ No newline at end of file + +} diff --git a/scripts/__chatterbox_trace/__chatterbox_trace.yy b/scripts/__chatterbox_trace/__chatterbox_trace.yy index 46f168a9..715d4110 100644 --- a/scripts/__chatterbox_trace/__chatterbox_trace.yy +++ b/scripts/__chatterbox_trace/__chatterbox_trace.yy @@ -1,8 +1,12 @@ { - "id": "511b43eb-944f-4793-a978-5172325a27b0", - "modelName": "GMScript", - "mvc": "1.0", - "name": "__chatterbox_trace", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "__Private", + "path": "folders/Scripts/Chatterbox/__Private.yy", + }, + "resourceVersion": "1.0", + "name": "__chatterbox_trace", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_body_count/chatterbox_body_count.gml b/scripts/chatterbox_body_count/chatterbox_body_count.gml index 20e6fdb5..5549cbc7 100644 --- a/scripts/chatterbox_body_count/chatterbox_body_count.gml +++ b/scripts/chatterbox_body_count/chatterbox_body_count.gml @@ -1,16 +1,20 @@ /// @param chatterboxHost +function chatterbox_body_count(argument0) { -var _chatterbox = argument0; + var _chatterbox = argument0; -var _count = 0; -var _child_array = _chatterbox[__CHATTERBOX_HOST.CHILDREN]; + var _count = 0; + var _child_array = _chatterbox[__CHATTERBOX_HOST.CHILDREN]; -var _i = 0; -repeat(array_length_1d(_child_array)) -{ - var _array = _child_array[_i]; - if (_array[__CHATTERBOX_CHILD.TYPE] == __CHATTERBOX_CHILD_TYPE.BODY) _count++; - ++_i; -} + var _i = 0; + repeat(array_length_1d(_child_array)) + { + var _array = _child_array[_i]; + if (_array[__CHATTERBOX_CHILD.TYPE] == __CHATTERBOX_CHILD_TYPE.BODY) _count++; + ++_i; + } + + return _count; -return _count; \ No newline at end of file + +} diff --git a/scripts/chatterbox_body_count/chatterbox_body_count.yy b/scripts/chatterbox_body_count/chatterbox_body_count.yy index 46aa7ab5..82ccab9c 100644 --- a/scripts/chatterbox_body_count/chatterbox_body_count.yy +++ b/scripts/chatterbox_body_count/chatterbox_body_count.yy @@ -1,8 +1,12 @@ { - "id": "15c3b5bf-0954-44f0-825f-43431206085c", - "modelName": "GMScript", - "mvc": "1.0", - "name": "chatterbox_body_count", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Chatterbox", + "path": "folders/Scripts/Chatterbox.yy", + }, + "resourceVersion": "1.0", + "name": "chatterbox_body_count", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_body_get/chatterbox_body_get.gml b/scripts/chatterbox_body_get/chatterbox_body_get.gml index f5eb336f..9af02740 100644 --- a/scripts/chatterbox_body_get/chatterbox_body_get.gml +++ b/scripts/chatterbox_body_get/chatterbox_body_get.gml @@ -1,23 +1,27 @@ /// @param chatterboxHost /// @param index +function chatterbox_body_get(argument0, argument1) { -var _chatterbox = argument0; -var _index = argument1; + var _chatterbox = argument0; + var _index = argument1; -var _count = 0; -var _child_array = _chatterbox[__CHATTERBOX_HOST.CHILDREN]; + var _count = 0; + var _child_array = _chatterbox[__CHATTERBOX_HOST.CHILDREN]; -var _i = 0; -repeat(array_length_1d(_child_array)) -{ - var _array = _child_array[ _i ]; - if (_array[ __CHATTERBOX_CHILD.TYPE ] == __CHATTERBOX_CHILD_TYPE.BODY) - { - if (_count == _index) return _array[__CHATTERBOX_CHILD.STRING]; - _count++; - } + var _i = 0; + repeat(array_length_1d(_child_array)) + { + var _array = _child_array[ _i ]; + if (_array[ __CHATTERBOX_CHILD.TYPE ] == __CHATTERBOX_CHILD_TYPE.BODY) + { + if (_count == _index) return _array[__CHATTERBOX_CHILD.STRING]; + _count++; + } - ++_i; -} + ++_i; + } + + return undefined; -return undefined; \ No newline at end of file + +} diff --git a/scripts/chatterbox_body_get/chatterbox_body_get.yy b/scripts/chatterbox_body_get/chatterbox_body_get.yy index 55b03c72..78ab7551 100644 --- a/scripts/chatterbox_body_get/chatterbox_body_get.yy +++ b/scripts/chatterbox_body_get/chatterbox_body_get.yy @@ -1,8 +1,12 @@ { - "id": "43355a1d-c927-4976-8b8c-ec643f1db781", - "modelName": "GMScript", - "mvc": "1.0", - "name": "chatterbox_body_get", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Chatterbox", + "path": "folders/Scripts/Chatterbox.yy", + }, + "resourceVersion": "1.0", + "name": "chatterbox_body_get", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_create_host/chatterbox_create_host.gml b/scripts/chatterbox_create_host/chatterbox_create_host.gml index 59621341..2d31a5f1 100644 --- a/scripts/chatterbox_create_host/chatterbox_create_host.gml +++ b/scripts/chatterbox_create_host/chatterbox_create_host.gml @@ -15,26 +15,30 @@ /// /// @param [filename] /// @param [singletonText] +function chatterbox_create_host() { -var _filename = ((argument_count > 0) && (argument[0] != undefined))? argument[0] : global.__chatterbox_default_file; -var _singleton_text = ((argument_count > 1) && (argument[1] != undefined))? argument[1] : true; + var _filename = ((argument_count > 0) && (argument[0] != undefined))? argument[0] : global.__chatterbox_default_file; + var _singleton_text = ((argument_count > 1) && (argument[1] != undefined))? argument[1] : true; -if (!is_string(_filename)) -{ - __chatterbox_error("Source files must be strings (Got \"" + string(_filename) + "\")"); - return undefined; -} + if (!is_string(_filename)) + { + __chatterbox_error("Source files must be strings (Got \"" + string(_filename) + "\")"); + return undefined; + } -if (!ds_map_exists(global.__chatterbox_file_data, _filename)) -{ - __chatterbox_error("Cannot find \"" + _filename + "\""); - return undefined; -} + if (!ds_map_exists(global.__chatterbox_file_data, _filename)) + { + __chatterbox_error("Cannot find \"" + _filename + "\""); + return undefined; + } + + //Create the Chatterbox data structure + var _chatterbox = array_create(__CHATTERBOX_HOST.__SIZE); + _chatterbox[@ __CHATTERBOX_HOST.FILENAME ] = _filename; + _chatterbox[@ __CHATTERBOX_HOST.TITLE ] = undefined; + _chatterbox[@ __CHATTERBOX_HOST.SINGLETON_TEXT ] = _singleton_text; + _chatterbox[@ __CHATTERBOX_HOST.CHILDREN ] = []; + return _chatterbox; -//Create the Chatterbox data structure -var _chatterbox = array_create(__CHATTERBOX_HOST.__SIZE); -_chatterbox[@ __CHATTERBOX_HOST.FILENAME ] = _filename; -_chatterbox[@ __CHATTERBOX_HOST.TITLE ] = undefined; -_chatterbox[@ __CHATTERBOX_HOST.SINGLETON_TEXT ] = _singleton_text; -_chatterbox[@ __CHATTERBOX_HOST.CHILDREN ] = []; -return _chatterbox; \ No newline at end of file + +} diff --git a/scripts/chatterbox_create_host/chatterbox_create_host.yy b/scripts/chatterbox_create_host/chatterbox_create_host.yy index 54859a60..bc29a53b 100644 --- a/scripts/chatterbox_create_host/chatterbox_create_host.yy +++ b/scripts/chatterbox_create_host/chatterbox_create_host.yy @@ -1,8 +1,12 @@ { - "id": "36f2c371-0af7-4281-bef1-c48ce4fbbb54", - "modelName": "GMScript", - "mvc": "1.0", - "name": "chatterbox_create_host", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Setup", + "path": "folders/Scripts/Chatterbox/Setup.yy", + }, + "resourceVersion": "1.0", + "name": "chatterbox_create_host", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_goto/chatterbox_goto.gml b/scripts/chatterbox_goto/chatterbox_goto.gml index 8ade543f..921a66ea 100644 --- a/scripts/chatterbox_goto/chatterbox_goto.gml +++ b/scripts/chatterbox_goto/chatterbox_goto.gml @@ -7,65 +7,69 @@ /// @param chatterboxHost /// @param nodeTitle /// @param [filename] +function chatterbox_goto() { -var _chatterbox = argument[0]; -var _node_title = argument[1]; + var _chatterbox = argument[0]; + var _node_title = argument[1]; -if (!is_string(_node_title)) -{ - __chatterbox_trace("Stopping"); - _chatterbox[@ __CHATTERBOX_HOST.TITLE ] = undefined; - exit; -} + if (!is_string(_node_title)) + { + __chatterbox_trace("Stopping"); + _chatterbox[@ __CHATTERBOX_HOST.TITLE ] = undefined; + exit; + } -if (argument_count > 2) && (argument[2] != undefined) -{ - var _filename = argument[2]; + if (argument_count > 2) && (argument[2] != undefined) + { + var _filename = argument[2]; - if (!is_string(_filename)) - { - __chatterbox_error("Yarn .json filenames must be strings (Got \"" + string(_filename) + "\")"); - return undefined; - } + if (!is_string(_filename)) + { + __chatterbox_error("Yarn .json filenames must be strings (Got \"" + string(_filename) + "\")"); + return undefined; + } - if (!ds_map_exists(global.__chatterbox_file_data, _filename)) - { - __chatterbox_error("Cannot find Yarn .json \"" + _filename + "\""); - return undefined; - } + if (!ds_map_exists(global.__chatterbox_file_data, _filename)) + { + __chatterbox_error("Cannot find Yarn .json \"" + _filename + "\""); + return undefined; + } - _chatterbox[@ __CHATTERBOX_HOST.FILENAME ] = _filename; -} -else -{ - _filename = _chatterbox[ __CHATTERBOX_HOST.FILENAME ]; -} + _chatterbox[@ __CHATTERBOX_HOST.FILENAME ] = _filename; + } + else + { + _filename = _chatterbox[ __CHATTERBOX_HOST.FILENAME ]; + } -var _key = _filename + CHATTERBOX_FILENAME_SEPARATOR + _node_title; -var _instruction = global.__chatterbox_goto[? _key ]; -if (_instruction == undefined) -{ - __chatterbox_error("Couldn't find title \"" + string(_node_title) + "\" from Yarn .json file \"" + string(_filename) + "\""); - return false; -} + var _key = _filename + CHATTERBOX_FILENAME_SEPARATOR + _node_title; + var _instruction = global.__chatterbox_goto[? _key ]; + if (_instruction == undefined) + { + __chatterbox_error("Couldn't find title \"" + string(_node_title) + "\" from Yarn .json file \"" + string(_filename) + "\""); + return false; + } -_chatterbox[@ __CHATTERBOX_HOST.TITLE ] = _node_title; -_chatterbox[@ __CHATTERBOX_HOST.FILENAME ] = _filename; + _chatterbox[@ __CHATTERBOX_HOST.TITLE ] = _node_title; + _chatterbox[@ __CHATTERBOX_HOST.FILENAME ] = _filename; -__chatterbox_trace("Starting node \"" + _node_title + "\" from \"" + _filename + "\""); + __chatterbox_trace("Starting node \"" + _node_title + "\" from \"" + _filename + "\""); -CHATTERBOX_VARIABLES_MAP[? "visited(" + _key + ")" ] = true; -if (CHATTERBOX_DEBUG) __chatterbox_trace(" Set \"visited(" + _key + ")\" to "); + CHATTERBOX_VARIABLES_MAP[? "visited(" + _key + ")" ] = true; + if (CHATTERBOX_DEBUG) __chatterbox_trace(" Set \"visited(" + _key + ")\" to "); -//Create a fake option -var _new_array = array_create(__CHATTERBOX_CHILD.__SIZE); -_new_array[@ __CHATTERBOX_CHILD.STRING ] = ""; -_new_array[@ __CHATTERBOX_CHILD.TYPE ] = __CHATTERBOX_CHILD_TYPE.OPTION; -_new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_START] = _instruction; -_new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_END ] = _instruction; + //Create a fake option + var _new_array = array_create(__CHATTERBOX_CHILD.__SIZE); + _new_array[@ __CHATTERBOX_CHILD.STRING ] = ""; + _new_array[@ __CHATTERBOX_CHILD.TYPE ] = __CHATTERBOX_CHILD_TYPE.OPTION; + _new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_START] = _instruction; + _new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_END ] = _instruction; -var _child_array = []; //Wipe all children -_chatterbox[@ __CHATTERBOX_HOST.CHILDREN] = _child_array; -_child_array[@ array_length_1d(_child_array)] = _new_array; + var _child_array = []; //Wipe all children + _chatterbox[@ __CHATTERBOX_HOST.CHILDREN] = _child_array; + _child_array[@ array_length_1d(_child_array)] = _new_array; -return chatterbox_select(_chatterbox, 0); //Now select the fake option! \ No newline at end of file + return chatterbox_select(_chatterbox, 0); //Now select the fake option! + + +} diff --git a/scripts/chatterbox_goto/chatterbox_goto.yy b/scripts/chatterbox_goto/chatterbox_goto.yy index a105ec95..1bc20076 100644 --- a/scripts/chatterbox_goto/chatterbox_goto.yy +++ b/scripts/chatterbox_goto/chatterbox_goto.yy @@ -1,8 +1,12 @@ { - "id": "9ac119d1-18d4-4e8d-b6fe-3a55f9192a0b", - "modelName": "GMScript", - "mvc": "1.0", - "name": "chatterbox_goto", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Chatterbox", + "path": "folders/Scripts/Chatterbox.yy", + }, + "resourceVersion": "1.0", + "name": "chatterbox_goto", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_init_add_action/chatterbox_init_add_action.gml b/scripts/chatterbox_init_add_action/chatterbox_init_add_action.gml index 9fd9d933..de72b290 100644 --- a/scripts/chatterbox_init_add_action/chatterbox_init_add_action.gml +++ b/scripts/chatterbox_init_add_action/chatterbox_init_add_action.gml @@ -33,61 +33,65 @@ /// /// @param name Action name, as a string /// @param script Numerical script index e.g. your_script +function chatterbox_init_add_action(argument0, argument1) { -var _name = argument0; -var _script = argument1; + var _name = argument0; + var _script = argument1; -if ( !variable_global_exists("__chatterbox_init_complete") ) -{ - __chatterbox_error("chatterbox_add_action() should be called after initialising Chatterbox."); - return false; -} + if ( !variable_global_exists("__chatterbox_init_complete") ) + { + __chatterbox_error("chatterbox_add_action() should be called after initialising Chatterbox."); + return false; + } -if (global.__chatterbox_init_complete) -{ - __chatterbox_error("chatterbox_init_add_action() should be called before chatterbox_init_end()"); - return false; -} + if (global.__chatterbox_init_complete) + { + __chatterbox_error("chatterbox_init_add_action() should be called before chatterbox_init_end()"); + return false; + } -if ( !is_string(_name) ) -{ - __chatterbox_error("Action names should be strings.\n(Input to script was \"" + string(_name) + "\")"); - return false; -} + if ( !is_string(_name) ) + { + __chatterbox_error("Action names should be strings.\n(Input to script was \"" + string(_name) + "\")"); + return false; + } -if ( !is_real(_script) ) -{ - __chatterbox_error("Scripts should be numerical script indices e.g. chatterbox_add_action(\"example\", your_script);\n(Input to script was \"" + string(_name) + "\")"); - return false; -} + if ( !is_real(_script) ) + { + __chatterbox_error("Scripts should be numerical script indices e.g. chatterbox_add_action(\"example\", your_script);\n(Input to script was \"" + string(_name) + "\")"); + return false; + } -if ( !script_exists(_script) ) -{ - __chatterbox_error("Script (" + string(_script) + ") doesn't exist!"); - return false; -} + if ( !script_exists(_script) ) + { + __chatterbox_error("Script (" + string(_script) + ") doesn't exist!"); + return false; + } -switch(_name) -{ - case "if": - case "else": - case "elseif": - case "end": - case "set": - case "stop": - case "wait": - case "visited": - __chatterbox_error("Action name \"" + _name + "\" is reserved for internal Chatterbox use.\nPlease choose another action name."); - return false; - break; -} + switch(_name) + { + case "if": + case "else": + case "elseif": + case "end": + case "set": + case "stop": + case "wait": + case "visited": + __chatterbox_error("Action name \"" + _name + "\" is reserved for internal Chatterbox use.\nPlease choose another action name."); + return false; + break; + } -var _old_script = global.__chatterbox_actions[? _name ]; -if ( is_real(_old_script) ) -{ - __chatterbox_trace("WARNING! Overwriting action \"" + _name + "\" tied to script \"" + script_get_name(_old_script) + "()\"" ); -} + var _old_script = global.__chatterbox_actions[? _name ]; + if ( is_real(_old_script) ) + { + __chatterbox_trace("WARNING! Overwriting action \"" + _name + "\" tied to script \"" + script_get_name(_old_script) + "()\"" ); + } + + global.__chatterbox_actions[? _name ] = _script; + __chatterbox_trace("Tying action \"" + _name + "\" to script \"" + script_get_name(_script) + "()\"" ); + return true; -global.__chatterbox_actions[? _name ] = _script; -__chatterbox_trace("Tying action \"" + _name + "\" to script \"" + script_get_name(_script) + "()\"" ); -return true; \ No newline at end of file + +} diff --git a/scripts/chatterbox_init_add_action/chatterbox_init_add_action.yy b/scripts/chatterbox_init_add_action/chatterbox_init_add_action.yy index 2e0ff6ef..fbc808a4 100644 --- a/scripts/chatterbox_init_add_action/chatterbox_init_add_action.yy +++ b/scripts/chatterbox_init_add_action/chatterbox_init_add_action.yy @@ -1,8 +1,12 @@ { - "id": "d25ff5fc-73bc-48eb-ad5c-e3a6cb63937e", - "modelName": "GMScript", - "mvc": "1.0", - "name": "chatterbox_init_add_action", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Extra", + "path": "folders/Scripts/Chatterbox/Setup/Extra.yy", + }, + "resourceVersion": "1.0", + "name": "chatterbox_init_add_action", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_init_add_findreplace/chatterbox_init_add_findreplace.gml b/scripts/chatterbox_init_add_findreplace/chatterbox_init_add_findreplace.gml index 9a15405f..aa43bb10 100644 --- a/scripts/chatterbox_init_add_findreplace/chatterbox_init_add_findreplace.gml +++ b/scripts/chatterbox_init_add_findreplace/chatterbox_init_add_findreplace.gml @@ -4,20 +4,24 @@ /// /// @param oldString /// @param newString +function chatterbox_init_add_findreplace(argument0, argument1) { -if ( !variable_global_exists("__chatterbox_init_complete") ) -{ - __chatterbox_error("chatterboc_init_findreplace() should be called after chatterbox_init_start()"); - return false; -} + if ( !variable_global_exists("__chatterbox_init_complete") ) + { + __chatterbox_error("chatterboc_init_findreplace() should be called after chatterbox_init_start()"); + return false; + } -if (global.__chatterbox_init_complete) -{ - __chatterbox_error("chatterboc_init_findreplace() should be called before chatterbox_init_end()"); - return false; -} + if (global.__chatterbox_init_complete) + { + __chatterbox_error("chatterboc_init_findreplace() should be called before chatterbox_init_end()"); + return false; + } + + ds_list_add(global.__chatterbox_findreplace_old_string, argument0); + ds_list_add(global.__chatterbox_findreplace_new_string, argument1); -ds_list_add(global.__chatterbox_findreplace_old_string, argument0); -ds_list_add(global.__chatterbox_findreplace_new_string, argument1); + return true; -return true; \ No newline at end of file + +} diff --git a/scripts/chatterbox_init_add_findreplace/chatterbox_init_add_findreplace.yy b/scripts/chatterbox_init_add_findreplace/chatterbox_init_add_findreplace.yy index eb4bf1ba..fbbe8fb0 100644 --- a/scripts/chatterbox_init_add_findreplace/chatterbox_init_add_findreplace.yy +++ b/scripts/chatterbox_init_add_findreplace/chatterbox_init_add_findreplace.yy @@ -1,8 +1,12 @@ { - "id": "6a735733-e38d-4fc8-ad9e-24d8b97c6adb", - "modelName": "GMScript", - "mvc": "1.0", - "name": "chatterbox_init_add_findreplace", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Extra", + "path": "folders/Scripts/Chatterbox/Setup/Extra.yy", + }, + "resourceVersion": "1.0", + "name": "chatterbox_init_add_findreplace", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_init_add_function/chatterbox_init_add_function.gml b/scripts/chatterbox_init_add_function/chatterbox_init_add_function.gml index d0892701..698724ba 100644 --- a/scripts/chatterbox_init_add_function/chatterbox_init_add_function.gml +++ b/scripts/chatterbox_init_add_function/chatterbox_init_add_function.gml @@ -24,55 +24,59 @@ /// /// @param name Script name, as a string /// @param [script] Numerical script index e.g. your_script +function chatterbox_init_add_function() { -var _name = argument[0]; -var _script = ((argument_count > 1) && (argument[1] != undefined))? argument[1] : asset_get_index(_script); + var _name = argument[0]; + var _script = ((argument_count > 1) && (argument[1] != undefined))? argument[1] : asset_get_index(_script); -if (!script_exists(_script)) -{ - __chatterbox_error("Script (" + string(_script) + ") doesn't exist!"); - return false; -} + if (!script_exists(_script)) + { + __chatterbox_error("Script (" + string(_script) + ") doesn't exist!"); + return false; + } -if ( !variable_global_exists("__chatterbox_init_complete") ) -{ - __chatterbox_error("chatterbox_init_add_function() should be called after initialising Chatterbox."); - return false; -} + if ( !variable_global_exists("__chatterbox_init_complete") ) + { + __chatterbox_error("chatterbox_init_add_function() should be called after initialising Chatterbox."); + return false; + } -if ( !is_string(_name) ) -{ - __chatterbox_error("Permitted script names should be strings.\n(Input was \"" + string(_name) + "\")"); - return false; -} + if ( !is_string(_name) ) + { + __chatterbox_error("Permitted script names should be strings.\n(Input was \"" + string(_name) + "\")"); + return false; + } -if ( !is_real(_script) ) -{ - __chatterbox_error("Scripts should be numerical script indices e.g. chatterbox_init_add_function(\"name\", your_script);\n(Input was \"" + string(_name) + "\")"); - return false; -} + if ( !is_real(_script) ) + { + __chatterbox_error("Scripts should be numerical script indices e.g. chatterbox_init_add_function(\"name\", your_script);\n(Input was \"" + string(_name) + "\")"); + return false; + } -switch(_name) -{ - case "if": - case "else": - case "elseif": - case "end": - case "set": - case "stop": - case "wait": - case "visited": - __chatterbox_error("Action name \"" + _name + "\" is reserved for internal Chatterbox use.\nPlease choose another action name."); - return false; - break; -} + switch(_name) + { + case "if": + case "else": + case "elseif": + case "end": + case "set": + case "stop": + case "wait": + case "visited": + __chatterbox_error("Action name \"" + _name + "\" is reserved for internal Chatterbox use.\nPlease choose another action name."); + return false; + break; + } -var _old_script = global.__chatterbox_permitted_scripts[? _name ]; -if ( is_real(_old_script) ) -{ - __chatterbox_trace("WARNING! Overwriting script name \"" + _name + "\" tied to \"" + script_get_name(_old_script) + "()\"" ); -} + var _old_script = global.__chatterbox_permitted_scripts[? _name ]; + if ( is_real(_old_script) ) + { + __chatterbox_trace("WARNING! Overwriting script name \"" + _name + "\" tied to \"" + script_get_name(_old_script) + "()\"" ); + } + + global.__chatterbox_permitted_scripts[? _name ] = _script; + __chatterbox_trace("Permitting script \"" + _name + "\", calling \"" + script_get_name(_script) + "()\"" ); + return true; -global.__chatterbox_permitted_scripts[? _name ] = _script; -__chatterbox_trace("Permitting script \"" + _name + "\", calling \"" + script_get_name(_script) + "()\"" ); -return true; \ No newline at end of file + +} diff --git a/scripts/chatterbox_init_add_function/chatterbox_init_add_function.yy b/scripts/chatterbox_init_add_function/chatterbox_init_add_function.yy index 430e6288..aa64a3a7 100644 --- a/scripts/chatterbox_init_add_function/chatterbox_init_add_function.yy +++ b/scripts/chatterbox_init_add_function/chatterbox_init_add_function.yy @@ -1,8 +1,12 @@ { - "id": "872012ae-b0bc-44c4-bc46-bf0e03659e62", - "modelName": "GMScript", - "mvc": "1.0", - "name": "chatterbox_init_add_function", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Extra", + "path": "folders/Scripts/Chatterbox/Setup/Extra.yy", + }, + "resourceVersion": "1.0", + "name": "chatterbox_init_add_function", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_init_add_json/chatterbox_init_add_json.gml b/scripts/chatterbox_init_add_json/chatterbox_init_add_json.gml index 74be069f..b90704d0 100644 --- a/scripts/chatterbox_init_add_json/chatterbox_init_add_json.gml +++ b/scripts/chatterbox_init_add_json/chatterbox_init_add_json.gml @@ -3,39 +3,43 @@ /// To find out more about Chatterbox's scripting language, "Yarn", please read the __chatterbox_syntax(). /// /// @param fileName Name of the Yarn .json file to add +function chatterbox_init_add_json(argument0) { -if ( !variable_global_exists("__chatterbox_init_complete") ) -{ - __chatterbox_error("chatterbox_init_add() should be called after chatterbox_init_start()"); - return undefined; -} + if ( !variable_global_exists("__chatterbox_init_complete") ) + { + __chatterbox_error("chatterbox_init_add() should be called after chatterbox_init_start()"); + return undefined; + } -if (global.__chatterbox_init_complete) -{ - __chatterbox_error("chatterbox_init_add() should be called before chatterbox_init_end()"); - return undefined; -} + if (global.__chatterbox_init_complete) + { + __chatterbox_error("chatterbox_init_add() should be called before chatterbox_init_end()"); + return undefined; + } -var _file = argument0; + var _file = argument0; -if (ds_map_exists(global.__chatterbox_file_data, _file)) -{ - __chatterbox_error("\"" + _file + "\" has already been added"); - return undefined; -} + if (ds_map_exists(global.__chatterbox_file_data, _file)) + { + __chatterbox_error("\"" + _file + "\" has already been added"); + return undefined; + } -if (!is_string(_file)) -{ - __chatterbox_error("Source files should be initialised using their filename as a string.\n(Input was an invalid datatype)"); - return undefined; -} + if (!is_string(_file)) + { + __chatterbox_error("Source files should be initialised using their filename as a string.\n(Input was an invalid datatype)"); + return undefined; + } -if (global.__chatterbox_default_file == "") global.__chatterbox_default_file = _file; + if (global.__chatterbox_default_file == "") global.__chatterbox_default_file = _file; -var _data = array_create(__CHATTERBOX_FILE.__SIZE); -global.__chatterbox_file_data[? _file ] = _data; -_data[@ __CHATTERBOX_FILE.FILENAME] = _file; -_data[@ __CHATTERBOX_FILE.NAME ] = _file; -_data[@ __CHATTERBOX_FILE.FORMAT ] = __CHATTERBOX_FORMAT.JSON; + var _data = array_create(__CHATTERBOX_FILE.__SIZE); + global.__chatterbox_file_data[? _file ] = _data; + _data[@ __CHATTERBOX_FILE.FILENAME] = _file; + _data[@ __CHATTERBOX_FILE.NAME ] = _file; + _data[@ __CHATTERBOX_FILE.FORMAT ] = __CHATTERBOX_FORMAT.JSON; -__chatterbox_trace("Added \"" + _file + "\" as a source file"); \ No newline at end of file + __chatterbox_trace("Added \"" + _file + "\" as a source file"); + + +} diff --git a/scripts/chatterbox_init_add_json/chatterbox_init_add_json.yy b/scripts/chatterbox_init_add_json/chatterbox_init_add_json.yy index 2a64220e..c30e39d4 100644 --- a/scripts/chatterbox_init_add_json/chatterbox_init_add_json.yy +++ b/scripts/chatterbox_init_add_json/chatterbox_init_add_json.yy @@ -1,8 +1,12 @@ { - "id": "48de0644-428c-4f83-84dc-d8f4ed174f63", - "modelName": "GMScript", - "mvc": "1.0", - "name": "chatterbox_init_add_json", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Setup", + "path": "folders/Scripts/Chatterbox/Setup.yy", + }, + "resourceVersion": "1.0", + "name": "chatterbox_init_add_json", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_init_add_yarn/chatterbox_init_add_yarn.gml b/scripts/chatterbox_init_add_yarn/chatterbox_init_add_yarn.gml index 0bb7d1ef..57efec74 100644 --- a/scripts/chatterbox_init_add_yarn/chatterbox_init_add_yarn.gml +++ b/scripts/chatterbox_init_add_yarn/chatterbox_init_add_yarn.gml @@ -3,39 +3,43 @@ /// To find out more about Chatterbox's scripting language, "Yarn", please read the __chatterbox_syntax(). /// /// @param fileName Name of the Yarn .json file to add +function chatterbox_init_add_yarn(argument0) { -if ( !variable_global_exists("__chatterbox_init_complete") ) -{ - __chatterbox_error("chatterbox_init_add() should be called after chatterbox_init_start()"); - return undefined; -} + if ( !variable_global_exists("__chatterbox_init_complete") ) + { + __chatterbox_error("chatterbox_init_add() should be called after chatterbox_init_start()"); + return undefined; + } -if (global.__chatterbox_init_complete) -{ - __chatterbox_error("chatterbox_init_add() should be called before chatterbox_init_end()"); - return undefined; -} + if (global.__chatterbox_init_complete) + { + __chatterbox_error("chatterbox_init_add() should be called before chatterbox_init_end()"); + return undefined; + } -var _file = argument0; + var _file = argument0; -if (ds_map_exists(global.__chatterbox_file_data, _file)) -{ - __chatterbox_error("\"" + _file + "\" has already been added"); - return undefined; -} + if (ds_map_exists(global.__chatterbox_file_data, _file)) + { + __chatterbox_error("\"" + _file + "\" has already been added"); + return undefined; + } -if (!is_string(_file)) -{ - __chatterbox_error("Source files should be initialised using their filename as a string.\n(Input was an invalid datatype)"); - return undefined; -} + if (!is_string(_file)) + { + __chatterbox_error("Source files should be initialised using their filename as a string.\n(Input was an invalid datatype)"); + return undefined; + } -if (global.__chatterbox_default_file == "") global.__chatterbox_default_file = _file; + if (global.__chatterbox_default_file == "") global.__chatterbox_default_file = _file; -var _data = array_create(__CHATTERBOX_FILE.__SIZE); -global.__chatterbox_file_data[? _file] = _data; -_data[@ __CHATTERBOX_FILE.FILENAME] = _file; -_data[@ __CHATTERBOX_FILE.NAME ] = _file; -_data[@ __CHATTERBOX_FILE.FORMAT ] = __CHATTERBOX_FORMAT.YARN; + var _data = array_create(__CHATTERBOX_FILE.__SIZE); + global.__chatterbox_file_data[? _file] = _data; + _data[@ __CHATTERBOX_FILE.FILENAME] = _file; + _data[@ __CHATTERBOX_FILE.NAME ] = _file; + _data[@ __CHATTERBOX_FILE.FORMAT ] = __CHATTERBOX_FORMAT.YARN; -__chatterbox_trace("Added \"" + _file + "\" as a source file"); \ No newline at end of file + __chatterbox_trace("Added \"" + _file + "\" as a source file"); + + +} diff --git a/scripts/chatterbox_init_add_yarn/chatterbox_init_add_yarn.yy b/scripts/chatterbox_init_add_yarn/chatterbox_init_add_yarn.yy index 5089d021..b1ce798a 100644 --- a/scripts/chatterbox_init_add_yarn/chatterbox_init_add_yarn.yy +++ b/scripts/chatterbox_init_add_yarn/chatterbox_init_add_yarn.yy @@ -1,8 +1,12 @@ { - "id": "f15d55bc-151d-4270-b176-8a9a3e0115da", - "modelName": "GMScript", - "mvc": "1.0", - "name": "chatterbox_init_add_yarn", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Setup", + "path": "folders/Scripts/Chatterbox/Setup.yy", + }, + "resourceVersion": "1.0", + "name": "chatterbox_init_add_yarn", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_init_end/chatterbox_init_end.gml b/scripts/chatterbox_init_end/chatterbox_init_end.gml index ac05a0c0..651e79be 100644 --- a/scripts/chatterbox_init_end/chatterbox_init_end.gml +++ b/scripts/chatterbox_init_end/chatterbox_init_end.gml @@ -20,509 +20,513 @@ /// To find out more about Chatterbox's scripting language, "Yarn", please read the __chatterbox_syntax(). /// /// Once this script has been run, Chatterbox is ready for use! +function chatterbox_init_end() { -var _timer = get_timer(); + var _timer = get_timer(); -if ( !variable_global_exists("__chatterbox_init_complete" ) ) -{ - __chatterbox_error("chatterbox_init_end() should be called after chatterbox_init_start()"); - exit; -} + if ( !variable_global_exists("__chatterbox_init_complete" ) ) + { + __chatterbox_error("chatterbox_init_end() should be called after chatterbox_init_start()"); + exit; + } -__chatterbox_trace("Completing initialisation"); + __chatterbox_trace("Completing initialisation"); -var _body_substring_list = ds_list_create(); + var _body_substring_list = ds_list_create(); -//Iterate over every source file added -var _font_count = ds_map_size(global.__chatterbox_file_data); -var _name = ds_map_find_first(global.__chatterbox_file_data); -repeat(_font_count) -{ - var _font_data = global.__chatterbox_file_data[? _name ]; - __chatterbox_trace(" Processing file \"" + _name + "\""); + //Iterate over every source file added + var _font_count = ds_map_size(global.__chatterbox_file_data); + var _name = ds_map_find_first(global.__chatterbox_file_data); + repeat(_font_count) + { + var _font_data = global.__chatterbox_file_data[? _name ]; + __chatterbox_trace(" Processing file \"" + _name + "\""); - var _filename = _font_data[__CHATTERBOX_FILE.FILENAME]; - var _file_type = _font_data[__CHATTERBOX_FILE.FORMAT ]; + var _filename = _font_data[__CHATTERBOX_FILE.FILENAME]; + var _file_type = _font_data[__CHATTERBOX_FILE.FORMAT ]; - ds_list_add(global.__chatterbox_vm, _filename); - var _instruction_file_offset = ds_list_size(global.__chatterbox_vm); - global.__chatterbox_goto[? _filename] = _instruction_file_offset; - if (CHATTERBOX_DEBUG_PARSER) __chatterbox_trace(" File instruction offset is " + string(_instruction_file_offset)); + ds_list_add(global.__chatterbox_vm, _filename); + var _instruction_file_offset = ds_list_size(global.__chatterbox_vm); + global.__chatterbox_goto[? _filename] = _instruction_file_offset; + if (CHATTERBOX_DEBUG_PARSER) __chatterbox_trace(" File instruction offset is " + string(_instruction_file_offset)); - var _node_list = undefined; + var _node_list = undefined; - var _buffer = buffer_load(global.__chatterbox_font_directory + _filename); - var _string = buffer_read(_buffer, buffer_string); - buffer_delete(_buffer); + var _buffer = buffer_load(global.__chatterbox_font_directory + _filename); + var _string = buffer_read(_buffer, buffer_string); + buffer_delete(_buffer); - switch(_file_type) - { - case __CHATTERBOX_FORMAT.YARN: + switch(_file_type) + { + case __CHATTERBOX_FORMAT.YARN: #region Parse .yarn file into a JSON - var _node_list = ds_list_create(); + var _node_list = ds_list_create(); - _string = string_replace_all(_string, "\n\r", "\n"); - _string = string_replace_all(_string, "\r\n", "\n"); - _string = string_replace_all(_string, "\r" , "\n"); - _string += "\n"; + _string = string_replace_all(_string, "\n\r", "\n"); + _string = string_replace_all(_string, "\r\n", "\n"); + _string = string_replace_all(_string, "\r" , "\n"); + _string += "\n"; - var _body = ""; - var _title = ""; - var _in_header = true; + var _body = ""; + var _title = ""; + var _in_header = true; - var _pos = string_pos("\n", _string); - while(_pos > 0) - { - var _substring = string_copy(_string, 1, _pos-1); - _string = string_delete(_string, 1, _pos); - _pos = string_pos("\n", _string); + var _pos = string_pos("\n", _string); + while(_pos > 0) + { + var _substring = string_copy(_string, 1, _pos-1); + _string = string_delete(_string, 1, _pos); + _pos = string_pos("\n", _string); - if (_in_header) - { - if (string_copy(_substring, 1, 6) == "title:") - { - _title = string_delete(_substring, 1, 6); - _title = __chatterbox_remove_whitespace(__chatterbox_remove_whitespace(_title, true), false); - } + if (_in_header) + { + if (string_copy(_substring, 1, 6) == "title:") + { + _title = string_delete(_substring, 1, 6); + _title = __chatterbox_remove_whitespace(__chatterbox_remove_whitespace(_title, true), false); + } - if (string_copy(_substring, 1, 3) == "---") - { - _in_header = false; - _body = ""; - } - } - else - { - if (string_copy(_substring, 1, 3) == "===") - { - var _map = ds_map_create(); - _map[? "body" ] = _body; - _map[? "title"] = _title; - ds_list_add(_node_list, _map); - ds_list_mark_as_map(_node_list, ds_list_size(_node_list)-1); + if (string_copy(_substring, 1, 3) == "---") + { + _in_header = false; + _body = ""; + } + } + else + { + if (string_copy(_substring, 1, 3) == "===") + { + var _map = ds_map_create(); + _map[? "body" ] = _body; + _map[? "title"] = _title; + ds_list_add(_node_list, _map); + ds_list_mark_as_map(_node_list, ds_list_size(_node_list)-1); - _in_header = true; - _body = ""; - _title = ""; - } - else - { - _body += _substring + "\n"; - } - } - } + _in_header = true; + _body = ""; + _title = ""; + } + else + { + _body += _substring + "\n"; + } + } + } #endregion - break; + break; - case __CHATTERBOX_FORMAT.JSON: + case __CHATTERBOX_FORMAT.JSON: #region Read and verify JSON - var _yarn_json = json_decode(_string); + var _yarn_json = json_decode(_string); - //Test for JSON made by the standard Yarn editor - var _node_list = _yarn_json[? "default" ]; - if (_node_list != undefined) __chatterbox_trace(" File was made in standard Yarn editor"); + //Test for JSON made by the standard Yarn editor + var _node_list = _yarn_json[? "default" ]; + if (_node_list != undefined) __chatterbox_trace(" File was made in standard Yarn editor"); - //Test for JSON made by Jacquard - if (_node_list == undefined) - { - var _node_list = _yarn_json[? "nodes" ]; - if (_node_list != undefined) __chatterbox_trace(" File was made by Jacquard"); - } + //Test for JSON made by Jacquard + if (_node_list == undefined) + { + var _node_list = _yarn_json[? "nodes" ]; + if (_node_list != undefined) __chatterbox_trace(" File was made by Jacquard"); + } - //Divorce the node list from the JSON - _yarn_json[? "default" ] = undefined; - _yarn_json[? "nodes" ] = undefined; - ds_map_destroy(_yarn_json); + //Divorce the node list from the JSON + _yarn_json[? "default" ] = undefined; + _yarn_json[? "nodes" ] = undefined; + ds_map_destroy(_yarn_json); #endregion - break; - } + break; + } - //If both of these fail, it's some wacky JSON that we don't recognise - if (_node_list == undefined) - { - __chatterbox_error("Format for \"" + _name + "\" is unrecognised.\nThis source file will be ignored."); - _name = ds_map_find_next(global.__chatterbox_file_data, _name); - continue; - } + //If both of these fail, it's some wacky JSON that we don't recognise + if (_node_list == undefined) + { + __chatterbox_error("Format for \"" + _name + "\" is unrecognised.\nThis source file will be ignored."); + _name = ds_map_find_next(global.__chatterbox_file_data, _name); + continue; + } - var _node_count = ds_list_size(_node_list); + var _node_count = ds_list_size(_node_list); - if (CHATTERBOX_DEBUG_TITLES) - { + if (CHATTERBOX_DEBUG_TITLES) + { #region Debug output that displays all the nodes in a file - if (_node_count > 0) - { - __chatterbox_trace(" Found " + string(_node_count) + " nodes/titles:"); - var _string = " "; + if (_node_count > 0) + { + __chatterbox_trace(" Found " + string(_node_count) + " nodes/titles:"); + var _string = " "; - var _i = 0; - for(var _node = 0; _node < _node_count; _node++) - { - var _node_map = _node_list[| _node]; + var _i = 0; + for(var _node = 0; _node < _node_count; _node++) + { + var _node_map = _node_list[| _node]; - _string += "\"" + _node_map[? "title" ] + "\""; - if (_node < _node_count-1) - { - _string += ", "; - _i++; - if (_i >= 10) - { - __chatterbox_trace(_string); - _string = " "; - _i = 0; - } - } - } - if (_i > 0) __chatterbox_trace(_string); - } + _string += "\"" + _node_map[? "title" ] + "\""; + if (_node < _node_count-1) + { + _string += ", "; + _i++; + if (_i >= 10) + { + __chatterbox_trace(_string); + _string = " "; + _i = 0; + } + } + } + if (_i > 0) __chatterbox_trace(_string); + } #endregion - } + } - //Iterate over all the nodes we found in this source file - for(var _node = 0; _node < _node_count; _node++) - { - var _node_map = _node_list[| _node]; - var _title = _node_map[? "title"]; - var _body = _node_map[? "body" ]; + //Iterate over all the nodes we found in this source file + for(var _node = 0; _node < _node_count; _node++) + { + var _node_map = _node_list[| _node]; + var _title = _node_map[? "title"]; + var _body = _node_map[? "body" ]; - //Prepare body string for parsing - _body = string_replace_all(_body, "\n\r", "\n"); - _body = string_replace_all(_body, "\r\n", "\n"); - _body = string_replace_all(_body, "\r" , "\n"); + //Prepare body string for parsing + _body = string_replace_all(_body, "\n\r", "\n"); + _body = string_replace_all(_body, "\r\n", "\n"); + _body = string_replace_all(_body, "\r" , "\n"); - //Perform find-replace - var _size = ds_list_size(global.__chatterbox_findreplace_old_string); - for(var _i = 0; _i < _size; _i++) - { - _body = string_replace_all(_body, - global.__chatterbox_findreplace_old_string[| _i ], - global.__chatterbox_findreplace_new_string[| _i ]); - } + //Perform find-replace + var _size = ds_list_size(global.__chatterbox_findreplace_old_string); + for(var _i = 0; _i < _size; _i++) + { + _body = string_replace_all(_body, + global.__chatterbox_findreplace_old_string[| _i ], + global.__chatterbox_findreplace_new_string[| _i ]); + } - if (CHATTERBOX_DEBUG_PARSER) - { - __chatterbox_trace(" Processing \"" + string(_title) + "\" = \"" + string_replace_all(string(_body), "\n", "\\n") + "\""); - } - _body += "\n"; + if (CHATTERBOX_DEBUG_PARSER) + { + __chatterbox_trace(" Processing \"" + string(_title) + "\" = \"" + string_replace_all(string(_body), "\n", "\\n") + "\""); + } + _body += "\n"; - ds_list_add(global.__chatterbox_vm, _filename + CHATTERBOX_FILENAME_SEPARATOR + _title); - var _instruction_node_offset = ds_list_size(global.__chatterbox_vm); - global.__chatterbox_goto[? _filename + CHATTERBOX_FILENAME_SEPARATOR + _title ] = _instruction_node_offset; - if (CHATTERBOX_DEBUG_PARSER) __chatterbox_trace(" Node instruction offset is " + string(_instruction_node_offset)); + ds_list_add(global.__chatterbox_vm, _filename + CHATTERBOX_FILENAME_SEPARATOR + _title); + var _instruction_node_offset = ds_list_size(global.__chatterbox_vm); + global.__chatterbox_goto[? _filename + CHATTERBOX_FILENAME_SEPARATOR + _title ] = _instruction_node_offset; + if (CHATTERBOX_DEBUG_PARSER) __chatterbox_trace(" Node instruction offset is " + string(_instruction_node_offset)); #region Break down body into substring - ds_list_clear(_body_substring_list); + ds_list_clear(_body_substring_list); - var _body_byte_length = string_byte_length(_body); - var _body_buffer = buffer_create(_body_byte_length+1, buffer_fixed, 1); - buffer_poke(_buffer, 0, buffer_string, _body); + var _body_byte_length = string_byte_length(_body); + var _body_buffer = buffer_create(_body_byte_length+1, buffer_fixed, 1); + buffer_poke(_buffer, 0, buffer_string, _body); - var _line = 0; - var _first_on_line = true; - var _indent = undefined; - var _newline = false; - var _cache = ""; - var _cache_type = "text"; - var _prev_value = 0; - var _value = 0; - var _next_value = buffer_read(_body_buffer, buffer_u8); + var _line = 0; + var _first_on_line = true; + var _indent = undefined; + var _newline = false; + var _cache = ""; + var _cache_type = "text"; + var _prev_value = 0; + var _value = 0; + var _next_value = buffer_read(_body_buffer, buffer_u8); - repeat(_body_byte_length) - { - _prev_value = _value; - _value = _next_value; - _next_value = buffer_read(_body_buffer, buffer_u8); + repeat(_body_byte_length) + { + _prev_value = _value; + _value = _next_value; + _next_value = buffer_read(_body_buffer, buffer_u8); - var _write_cache = true; - var _pop_cache = false; + var _write_cache = true; + var _pop_cache = false; - if ((_value == ord("\n")) || (_value == ord("\r"))) - { - _newline = true; - _pop_cache = true; - _write_cache = false; - } - else if (_value == ord(CHATTERBOX_OPTION_OPEN_DELIMITER)) - { - if (_next_value == ord(CHATTERBOX_OPTION_OPEN_DELIMITER)) - { - _write_cache = false; - _pop_cache = true; - } - else if (_prev_value == ord(CHATTERBOX_OPTION_OPEN_DELIMITER)) - { - _write_cache = false; - _cache_type = "option"; - } - } - else if (_value == ord(CHATTERBOX_OPTION_CLOSE_DELIMITER)) - { - if (_next_value == ord(CHATTERBOX_OPTION_CLOSE_DELIMITER)) - { - _write_cache = false; - _pop_cache = true; - } - else if (_prev_value == ord(CHATTERBOX_OPTION_CLOSE_DELIMITER)) - { - _write_cache = false; - } - } - else if (_value == ord(CHATTERBOX_ACTION_OPEN_DELIMITER)) - { - if (_next_value == ord(CHATTERBOX_ACTION_OPEN_DELIMITER)) - { - _write_cache = false; - _pop_cache = true; - } - else if (_prev_value == ord(CHATTERBOX_ACTION_OPEN_DELIMITER)) - { - _write_cache = false; - _cache_type = "action"; - } - } - else if (_value == ord(CHATTERBOX_ACTION_CLOSE_DELIMITER)) - { - if (_next_value == ord(CHATTERBOX_ACTION_CLOSE_DELIMITER)) - { - _write_cache = false; - _pop_cache = true; - } - else if (_prev_value == ord(CHATTERBOX_ACTION_CLOSE_DELIMITER)) - { - _write_cache = false; - } - } + if ((_value == ord("\n")) || (_value == ord("\r"))) + { + _newline = true; + _pop_cache = true; + _write_cache = false; + } + else if (_value == ord(CHATTERBOX_OPTION_OPEN_DELIMITER)) + { + if (_next_value == ord(CHATTERBOX_OPTION_OPEN_DELIMITER)) + { + _write_cache = false; + _pop_cache = true; + } + else if (_prev_value == ord(CHATTERBOX_OPTION_OPEN_DELIMITER)) + { + _write_cache = false; + _cache_type = "option"; + } + } + else if (_value == ord(CHATTERBOX_OPTION_CLOSE_DELIMITER)) + { + if (_next_value == ord(CHATTERBOX_OPTION_CLOSE_DELIMITER)) + { + _write_cache = false; + _pop_cache = true; + } + else if (_prev_value == ord(CHATTERBOX_OPTION_CLOSE_DELIMITER)) + { + _write_cache = false; + } + } + else if (_value == ord(CHATTERBOX_ACTION_OPEN_DELIMITER)) + { + if (_next_value == ord(CHATTERBOX_ACTION_OPEN_DELIMITER)) + { + _write_cache = false; + _pop_cache = true; + } + else if (_prev_value == ord(CHATTERBOX_ACTION_OPEN_DELIMITER)) + { + _write_cache = false; + _cache_type = "action"; + } + } + else if (_value == ord(CHATTERBOX_ACTION_CLOSE_DELIMITER)) + { + if (_next_value == ord(CHATTERBOX_ACTION_CLOSE_DELIMITER)) + { + _write_cache = false; + _pop_cache = true; + } + else if (_prev_value == ord(CHATTERBOX_ACTION_CLOSE_DELIMITER)) + { + _write_cache = false; + } + } - if (_write_cache) _cache += chr(_value); + if (_write_cache) _cache += chr(_value); - if (_pop_cache) - { - if (_first_on_line) - { - _cache = __chatterbox_remove_whitespace(_cache, true); - _indent = global.__chatterbox_indent_size; - } + if (_pop_cache) + { + if (_first_on_line) + { + _cache = __chatterbox_remove_whitespace(_cache, true); + _indent = global.__chatterbox_indent_size; + } - if (_cache != "") ds_list_add(_body_substring_list, [_cache, _cache_type, _line, _indent]); - _cache = ""; - _cache_type = "text"; + if (_cache != "") ds_list_add(_body_substring_list, [_cache, _cache_type, _line, _indent]); + _cache = ""; + _cache_type = "text"; - if (_newline) - { - _newline = false; - ++_line; - _first_on_line = true; - _indent = undefined; - } - else - { - _first_on_line = false; - } - } - } + if (_newline) + { + _newline = false; + ++_line; + _first_on_line = true; + _indent = undefined; + } + else + { + _first_on_line = false; + } + } + } - buffer_delete(_body_buffer); + buffer_delete(_body_buffer); #endregion - global.__chatterbox_insert_pos = ds_list_size(global.__chatterbox_vm); - var _branch_stack = ds_list_create(); - var _previous_line = -1; - var _body_substring_count = ds_list_size(_body_substring_list); - for(var _sub = 0; _sub < _body_substring_count; _sub++) - { - var _substring_array = _body_substring_list[| _sub]; - var _string = _substring_array[0]; - var _substring_type = _substring_array[1]; - var _substring_line = _substring_array[2]; - var _substring_indent = _substring_array[3]; + global.__chatterbox_insert_pos = ds_list_size(global.__chatterbox_vm); + var _branch_stack = ds_list_create(); + var _previous_line = -1; + var _body_substring_count = ds_list_size(_body_substring_list); + for(var _sub = 0; _sub < _body_substring_count; _sub++) + { + var _substring_array = _body_substring_list[| _sub]; + var _string = _substring_array[0]; + var _substring_type = _substring_array[1]; + var _substring_line = _substring_array[2]; + var _substring_indent = _substring_array[3]; - if (_substring_line > _previous_line) - { - var _branch_top = _branch_stack[| ds_list_size(_branch_stack)-1]; - while (is_array(_branch_top) && (_substring_indent <= _branch_top[2])) - { - ds_list_delete(_branch_stack, ds_list_size(_branch_stack)-1); - if (_branch_top[3]) __chatterbox_new_instruction(_branch_top[0], _branch_top[2]); - _branch_top = _branch_stack[| ds_list_size(_branch_stack)-1]; - } - } + if (_substring_line > _previous_line) + { + var _branch_top = _branch_stack[| ds_list_size(_branch_stack)-1]; + while (is_array(_branch_top) && (_substring_indent <= _branch_top[2])) + { + ds_list_delete(_branch_stack, ds_list_size(_branch_stack)-1); + if (_branch_top[3]) __chatterbox_new_instruction(_branch_top[0], _branch_top[2]); + _branch_top = _branch_stack[| ds_list_size(_branch_stack)-1]; + } + } - if (_substring_type == "option") - { + if (_substring_type == "option") + { #region [[option]] - var _pos = string_pos("|", _string); - if (_pos < 1) - { - __chatterbox_new_instruction(__CHATTERBOX_VM_REDIRECT, _substring_indent, - [__chatterbox_remove_whitespace(__chatterbox_remove_whitespace(_string, true), false)]); - } - else - { - __chatterbox_new_instruction(__CHATTERBOX_VM_OPTION, _substring_indent, - [__chatterbox_remove_whitespace(string_copy(_string, 1, _pos-1), false), - __chatterbox_remove_whitespace(string_delete(_string, 1, _pos), true)]); - } + var _pos = string_pos("|", _string); + if (_pos < 1) + { + __chatterbox_new_instruction(__CHATTERBOX_VM_REDIRECT, _substring_indent, + [__chatterbox_remove_whitespace(__chatterbox_remove_whitespace(_string, true), false)]); + } + else + { + __chatterbox_new_instruction(__CHATTERBOX_VM_OPTION, _substring_indent, + [__chatterbox_remove_whitespace(string_copy(_string, 1, _pos-1), false), + __chatterbox_remove_whitespace(string_delete(_string, 1, _pos), true)]); + } #endregion - } - else if (_substring_type == "action") - { - var _content = __chatterbox_tokenize_action(_string); + } + else if (_substring_type == "action") + { + var _content = __chatterbox_tokenize_action(_string); #region Add instruction based on content array - if (_content[0] == "if") - { - if (_substring_line > _previous_line) - { - //If-statement on its own on a line - __chatterbox_new_instruction(__CHATTERBOX_VM_IF, _substring_indent, _content); - ds_list_add(_branch_stack, [__CHATTERBOX_VM_ENDIF, //Type - global.__chatterbox_insert_pos-1, //Start position - _substring_indent, //Indentation - false]); //Automatically create an ENDIF - } - else - { - //If-statement suffixed to another token - __chatterbox_new_instruction(__CHATTERBOX_VM_IF, _substring_indent, _content, global.__chatterbox_insert_pos-1); - ds_list_insert(_branch_stack, ds_list_size(_branch_stack)-1, - [__CHATTERBOX_VM_ENDIF, //Type - global.__chatterbox_insert_pos-1, //Start position - _substring_indent, //Indentation - true]); //Automatically create an ENDIF - global.__chatterbox_insert_pos++; - } - } - else if ((_content[0] == "else") || (_content[0] == "elseif") || (_content[0] == "else if")) - { - __chatterbox_new_instruction(__CHATTERBOX_VM_ELSEIF, _substring_indent, _content); - } - else if ((_content[0] == "endif") || (_content[0] == "end if")) - { - __chatterbox_new_instruction(__CHATTERBOX_VM_ENDIF, _substring_indent); - } - else if (_content[0] == "set") - { - __chatterbox_new_instruction(__CHATTERBOX_VM_SET, _substring_indent, _content); - } - else if (_content[0] == "stop") - { - __chatterbox_new_instruction(__CHATTERBOX_VM_STOP, _substring_indent); - } - else if (_content[0] == "wait") - { - __chatterbox_new_instruction(__CHATTERBOX_VM_WAIT, _substring_indent); - } - else if (ds_map_exists(global.__chatterbox_actions, _content[0])) - { - __chatterbox_new_instruction(__CHATTERBOX_VM_CUSTOM_ACTION, _substring_indent, _content); - } - else - { - __chatterbox_new_instruction(__CHATTERBOX_VM_GENERIC_ACTION, _substring_indent, [_string]); - } + if (_content[0] == "if") + { + if (_substring_line > _previous_line) + { + //If-statement on its own on a line + __chatterbox_new_instruction(__CHATTERBOX_VM_IF, _substring_indent, _content); + ds_list_add(_branch_stack, [__CHATTERBOX_VM_ENDIF, //Type + global.__chatterbox_insert_pos-1, //Start position + _substring_indent, //Indentation + false]); //Automatically create an ENDIF + } + else + { + //If-statement suffixed to another token + __chatterbox_new_instruction(__CHATTERBOX_VM_IF, _substring_indent, _content, global.__chatterbox_insert_pos-1); + ds_list_insert(_branch_stack, ds_list_size(_branch_stack)-1, + [__CHATTERBOX_VM_ENDIF, //Type + global.__chatterbox_insert_pos-1, //Start position + _substring_indent, //Indentation + true]); //Automatically create an ENDIF + global.__chatterbox_insert_pos++; + } + } + else if ((_content[0] == "else") || (_content[0] == "elseif") || (_content[0] == "else if")) + { + __chatterbox_new_instruction(__CHATTERBOX_VM_ELSEIF, _substring_indent, _content); + } + else if ((_content[0] == "endif") || (_content[0] == "end if")) + { + __chatterbox_new_instruction(__CHATTERBOX_VM_ENDIF, _substring_indent); + } + else if (_content[0] == "set") + { + __chatterbox_new_instruction(__CHATTERBOX_VM_SET, _substring_indent, _content); + } + else if (_content[0] == "stop") + { + __chatterbox_new_instruction(__CHATTERBOX_VM_STOP, _substring_indent); + } + else if (_content[0] == "wait") + { + __chatterbox_new_instruction(__CHATTERBOX_VM_WAIT, _substring_indent); + } + else if (ds_map_exists(global.__chatterbox_actions, _content[0])) + { + __chatterbox_new_instruction(__CHATTERBOX_VM_CUSTOM_ACTION, _substring_indent, _content); + } + else + { + __chatterbox_new_instruction(__CHATTERBOX_VM_GENERIC_ACTION, _substring_indent, [_string]); + } #endregion #endregion - } - else if (string_copy(_string, 1, 2) == "->") //Shortcut - { - __chatterbox_new_instruction(__CHATTERBOX_VM_SHORTCUT, _substring_indent, - [__chatterbox_remove_whitespace(string_delete(_string, 1, 2), true)]); + } + else if (string_copy(_string, 1, 2) == "->") //Shortcut + { + __chatterbox_new_instruction(__CHATTERBOX_VM_SHORTCUT, _substring_indent, + [__chatterbox_remove_whitespace(string_delete(_string, 1, 2), true)]); - ds_list_add(_branch_stack, [__CHATTERBOX_VM_SHORTCUT_END, //Type - global.__chatterbox_insert_pos-1, //Start position - _substring_indent, //Indentation - true]); //Automatically create a SHORTCUT_END - } - else //Text - { - __chatterbox_new_instruction(__CHATTERBOX_VM_TEXT, _substring_indent, [_string]); - } + ds_list_add(_branch_stack, [__CHATTERBOX_VM_SHORTCUT_END, //Type + global.__chatterbox_insert_pos-1, //Start position + _substring_indent, //Indentation + true]); //Automatically create a SHORTCUT_END + } + else //Text + { + __chatterbox_new_instruction(__CHATTERBOX_VM_TEXT, _substring_indent, [_string]); + } - _previous_line = _substring_line; - } + _previous_line = _substring_line; + } - ds_list_destroy(_branch_stack); + ds_list_destroy(_branch_stack); - __chatterbox_new_instruction(__CHATTERBOX_VM_STOP, 0, undefined, ds_list_size(global.__chatterbox_vm)); + __chatterbox_new_instruction(__CHATTERBOX_VM_STOP, 0, undefined, ds_list_size(global.__chatterbox_vm)); - if (CHATTERBOX_DEBUG_PARSER) - { + if (CHATTERBOX_DEBUG_PARSER) + { #region Debug output that enumerates all instructions for this node - var _i = _instruction_node_offset; - repeat(ds_list_size(global.__chatterbox_vm) - _instruction_node_offset) - { - var _array = global.__chatterbox_vm[| _i]; + var _i = _instruction_node_offset; + repeat(ds_list_size(global.__chatterbox_vm) - _instruction_node_offset) + { + var _array = global.__chatterbox_vm[| _i]; - if (is_array(_array)) - { - _string = ""; + if (is_array(_array)) + { + _string = ""; - var _type = _array[__CHATTERBOX_INSTRUCTION.TYPE ]; - var _indent = _array[__CHATTERBOX_INSTRUCTION.INDENT ]; - var _content = _array[__CHATTERBOX_INSTRUCTION.CONTENT]; + var _type = _array[__CHATTERBOX_INSTRUCTION.TYPE ]; + var _indent = _array[__CHATTERBOX_INSTRUCTION.INDENT ]; + var _content = _array[__CHATTERBOX_INSTRUCTION.CONTENT]; - repeat(_indent) _string += " "; - _string += string(_type); + repeat(_indent) _string += " "; + _string += string(_type); - if (_content != undefined) - { - if (is_array(_content)) - { - _string += " " + __chatterbox_array_to_string(_content); - } - else - { - _string += " " + string(_content); - } - } - } - else - { - _string = string(_array); - } + if (_content != undefined) + { + if (is_array(_content)) + { + _string += " " + __chatterbox_array_to_string(_content); + } + else + { + _string += " " + string(_content); + } + } + } + else + { + _string = string(_array); + } - __chatterbox_trace(" " + _string); + __chatterbox_trace(" " + _string); - _i++; - } + _i++; + } #endregion - } - } + } + } - _name = ds_map_find_next(global.__chatterbox_file_data, _name); - ds_list_destroy(_node_list); -} + _name = ds_map_find_next(global.__chatterbox_file_data, _name); + ds_list_destroy(_node_list); + } + + ds_list_destroy(_body_substring_list); -ds_list_destroy(_body_substring_list); + __chatterbox_trace("VM has " + string(ds_list_size(global.__chatterbox_vm)) + " instructions"); + __chatterbox_trace("Initialisation complete, took " + string((get_timer() - _timer)/1000) + "ms"); -__chatterbox_trace("VM has " + string(ds_list_size(global.__chatterbox_vm)) + " instructions"); -__chatterbox_trace("Initialisation complete, took " + string((get_timer() - _timer)/1000) + "ms"); + global.__chatterbox_init_complete = true; -global.__chatterbox_init_complete = true; \ No newline at end of file + +} diff --git a/scripts/chatterbox_init_end/chatterbox_init_end.yy b/scripts/chatterbox_init_end/chatterbox_init_end.yy index 82718b25..9e113d81 100644 --- a/scripts/chatterbox_init_end/chatterbox_init_end.yy +++ b/scripts/chatterbox_init_end/chatterbox_init_end.yy @@ -1,8 +1,12 @@ { - "id": "7078f18e-cab5-4718-9cff-70420fb20d03", - "modelName": "GMScript", - "mvc": "1.0", - "name": "chatterbox_init_end", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Setup", + "path": "folders/Scripts/Chatterbox/Setup.yy", + }, + "resourceVersion": "1.0", + "name": "chatterbox_init_end", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_init_start/chatterbox_init_start.gml b/scripts/chatterbox_init_start/chatterbox_init_start.gml index 02b1b16d..825f28f8 100644 --- a/scripts/chatterbox_init_start/chatterbox_init_start.gml +++ b/scripts/chatterbox_init_start/chatterbox_init_start.gml @@ -4,58 +4,59 @@ /// Initialisation is only fully complete once chatterbox_init_end() is called. /// /// @param fileDirectory Directory to look in (relative to game_save_id) for Yarn source files +function chatterbox_init_start(argument0) { #region Internal Macro Definitions #macro __CHATTERBOX_VERSION "0.3.0" #macro __CHATTERBOX_DATE "2020/05/05" -enum __CHATTERBOX_FILE -{ - FILENAME, //0 - NAME, //1 - FORMAT, //2 - __SIZE //3 -} - -enum __CHATTERBOX_INSTRUCTION -{ - TYPE, //0 - INDENT, //1 - CONTENT, //2 //A nested array, which is turn might have arrays in it (!) - BLOCK_END, //3 - __SIZE //4 -} - -enum __CHATTERBOX_HOST -{ - FILENAME, //0 - TITLE, //1 - SINGLETON_TEXT, //2 - CHILDREN, //3 //A nested array - __SIZE //4 -} - -enum __CHATTERBOX_CHILD -{ - STRING, //0 - TYPE, //1 - INSTRUCTION_START, //2 - INSTRUCTION_END, //3 - __SIZE //4 -} - -enum __CHATTERBOX_CHILD_TYPE -{ - BODY, - OPTION -} - -enum __CHATTERBOX_FORMAT -{ - JSON, - YARN -} + enum __CHATTERBOX_FILE + { + FILENAME, //0 + NAME, //1 + FORMAT, //2 + __SIZE //3 + } + + enum __CHATTERBOX_INSTRUCTION + { + TYPE, //0 + INDENT, //1 + CONTENT, //2 //A nested array, which is turn might have arrays in it (!) + BLOCK_END, //3 + __SIZE //4 + } + + enum __CHATTERBOX_HOST + { + FILENAME, //0 + TITLE, //1 + SINGLETON_TEXT, //2 + CHILDREN, //3 //A nested array + __SIZE //4 + } + + enum __CHATTERBOX_CHILD + { + STRING, //0 + TYPE, //1 + INSTRUCTION_START, //2 + INSTRUCTION_END, //3 + __SIZE //4 + } + + enum __CHATTERBOX_CHILD_TYPE + { + BODY, + OPTION + } + + enum __CHATTERBOX_FORMAT + { + JSON, + YARN + } #macro __CHATTERBOX_VARIABLE_INVALID "__chatterbox_variable_error" @@ -79,74 +80,77 @@ enum __CHATTERBOX_FORMAT #endregion -if ( variable_global_exists("__chatterbox_init_complete") ) -{ - __chatterbox_error("chatterbox_init_start() should not be called twice!"); - exit; -} - -__chatterbox_trace("Welcome to Chatterbox by @jujuadams! This is version " + __CHATTERBOX_VERSION + ", " + __CHATTERBOX_DATE); + if ( variable_global_exists("__chatterbox_init_complete") ) + { + __chatterbox_error("chatterbox_init_start() should not be called twice!"); + exit; + } + + __chatterbox_trace("Welcome to Chatterbox by @jujuadams! This is version " + __CHATTERBOX_VERSION + ", " + __CHATTERBOX_DATE); + + var _font_directory = argument0; + + if (__CHATTERBOX_ON_MOBILE) + { + if (_font_directory != "") + { + __chatterbox_trace("Included Files work a bit strangely on iOS and Android. Please use an empty string for the font directory and place Yarn .json files in the root of Included Files."); + __chatterbox_error("GameMaker's Included Files work a bit strangely on iOS and Android.\nPlease use an empty string for the font directory and place Yarn .json files in the root of Included Files.\n ", true); + exit; + } + } + else + { + //Fix the font directory name if it's weird + var _char = string_char_at(_font_directory, string_length(_font_directory)); + if (_char != "\\") && (_char != "/") _font_directory += "\\"; + } + + //Check if the directory exists + if ( !directory_exists(_font_directory) ) + { + __chatterbox_trace("WARNING! Font directory \"" + string(_font_directory) + "\" could not be found in \"" + game_save_id + "\"!"); + } + + //Declare global variables + global.__chatterbox_font_directory = _font_directory; + global.chatterbox_variables_map = ds_map_create(); + global.__chatterbox_file_data = ds_map_create(); + global.__chatterbox_goto = ds_map_create(); + global.__chatterbox_vm = ds_list_create(); + global.__chatterbox_init_complete = false; + global.__chatterbox_default_file = ""; + global.__chatterbox_indent_size = 0; + global.__chatterbox_scope = CHATTERBOX_SCOPE_INVALID; + global.__chatterbox_variable_name = __CHATTERBOX_VARIABLE_INVALID; + global.__chatterbox_actions = ds_map_create(); + global.__chatterbox_permitted_scripts = ds_map_create(); + global.__chatterbox_findreplace_old_string = ds_list_create(); + global.__chatterbox_findreplace_new_string = ds_list_create(); + + //Big ol' list of operator dipthongs + global.__chatterbox_op_list = ds_list_create(); + global.__chatterbox_op_list[| 0 ] = "("; + global.__chatterbox_op_list[| 1 ] = "!"; + global.__chatterbox_op_list[| 2 ] = "/="; + global.__chatterbox_op_list[| 3 ] = "/"; + global.__chatterbox_op_list[| 4 ] = "*="; + global.__chatterbox_op_list[| 5 ] = "*"; + global.__chatterbox_op_list[| 6 ] = "+"; + global.__chatterbox_op_list[| 7 ] = "+="; + global.__chatterbox_op_list[| 8 ] = "-"; + global.__chatterbox_op_list[| 9 ] = "-"; global.__chatterbox_negative_op_index = 9; + global.__chatterbox_op_list[| 10 ] = "-="; + global.__chatterbox_op_list[| 11 ] = "||"; + global.__chatterbox_op_list[| 12 ] = "&&"; + global.__chatterbox_op_list[| 13 ] = ">="; + global.__chatterbox_op_list[| 14 ] = "<="; + global.__chatterbox_op_list[| 15 ] = ">"; + global.__chatterbox_op_list[| 16 ] = "<"; + global.__chatterbox_op_list[| 17 ] = "!="; + global.__chatterbox_op_list[| 18 ] = "=="; + global.__chatterbox_op_list[| 19 ] = "="; + global.__chatterbox_op_count = ds_list_size(global.__chatterbox_op_list); -var _font_directory = argument0; -if (__CHATTERBOX_ON_MOBILE) -{ - if (_font_directory != "") - { - __chatterbox_trace("Included Files work a bit strangely on iOS and Android. Please use an empty string for the font directory and place Yarn .json files in the root of Included Files."); - __chatterbox_error("GameMaker's Included Files work a bit strangely on iOS and Android.\nPlease use an empty string for the font directory and place Yarn .json files in the root of Included Files.\n ", true); - exit; - } } -else -{ - //Fix the font directory name if it's weird - var _char = string_char_at(_font_directory, string_length(_font_directory)); - if (_char != "\\") && (_char != "/") _font_directory += "\\"; -} - -//Check if the directory exists -if ( !directory_exists(_font_directory) ) -{ - __chatterbox_trace("WARNING! Font directory \"" + string(_font_directory) + "\" could not be found in \"" + game_save_id + "\"!"); -} - -//Declare global variables -global.__chatterbox_font_directory = _font_directory; -global.chatterbox_variables_map = ds_map_create(); -global.__chatterbox_file_data = ds_map_create(); -global.__chatterbox_goto = ds_map_create(); -global.__chatterbox_vm = ds_list_create(); -global.__chatterbox_init_complete = false; -global.__chatterbox_default_file = ""; -global.__chatterbox_indent_size = 0; -global.__chatterbox_scope = CHATTERBOX_SCOPE_INVALID; -global.__chatterbox_variable_name = __CHATTERBOX_VARIABLE_INVALID; -global.__chatterbox_actions = ds_map_create(); -global.__chatterbox_permitted_scripts = ds_map_create(); -global.__chatterbox_findreplace_old_string = ds_list_create(); -global.__chatterbox_findreplace_new_string = ds_list_create(); - -//Big ol' list of operator dipthongs -global.__chatterbox_op_list = ds_list_create(); -global.__chatterbox_op_list[| 0 ] = "("; -global.__chatterbox_op_list[| 1 ] = "!"; -global.__chatterbox_op_list[| 2 ] = "/="; -global.__chatterbox_op_list[| 3 ] = "/"; -global.__chatterbox_op_list[| 4 ] = "*="; -global.__chatterbox_op_list[| 5 ] = "*"; -global.__chatterbox_op_list[| 6 ] = "+"; -global.__chatterbox_op_list[| 7 ] = "+="; -global.__chatterbox_op_list[| 8 ] = "-"; -global.__chatterbox_op_list[| 9 ] = "-"; global.__chatterbox_negative_op_index = 9; -global.__chatterbox_op_list[| 10 ] = "-="; -global.__chatterbox_op_list[| 11 ] = "||"; -global.__chatterbox_op_list[| 12 ] = "&&"; -global.__chatterbox_op_list[| 13 ] = ">="; -global.__chatterbox_op_list[| 14 ] = "<="; -global.__chatterbox_op_list[| 15 ] = ">"; -global.__chatterbox_op_list[| 16 ] = "<"; -global.__chatterbox_op_list[| 17 ] = "!="; -global.__chatterbox_op_list[| 18 ] = "=="; -global.__chatterbox_op_list[| 19 ] = "="; -global.__chatterbox_op_count = ds_list_size(global.__chatterbox_op_list); \ No newline at end of file diff --git a/scripts/chatterbox_init_start/chatterbox_init_start.yy b/scripts/chatterbox_init_start/chatterbox_init_start.yy index 2d621cbd..a23180b7 100644 --- a/scripts/chatterbox_init_start/chatterbox_init_start.yy +++ b/scripts/chatterbox_init_start/chatterbox_init_start.yy @@ -1,8 +1,12 @@ { - "id": "ffc75b87-7243-4a9b-8f82-a7aec1b436ba", - "modelName": "GMScript", - "mvc": "1.0", - "name": "chatterbox_init_start", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Setup", + "path": "folders/Scripts/Chatterbox/Setup.yy", + }, + "resourceVersion": "1.0", + "name": "chatterbox_init_start", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_option_count/chatterbox_option_count.gml b/scripts/chatterbox_option_count/chatterbox_option_count.gml index f39cd655..74dd8eec 100644 --- a/scripts/chatterbox_option_count/chatterbox_option_count.gml +++ b/scripts/chatterbox_option_count/chatterbox_option_count.gml @@ -1,16 +1,20 @@ /// @param chatterboxHost +function chatterbox_option_count(argument0) { -var _chatterbox = argument0; + var _chatterbox = argument0; -var _count = 0; -var _child_array = _chatterbox[__CHATTERBOX_HOST.CHILDREN]; + var _count = 0; + var _child_array = _chatterbox[__CHATTERBOX_HOST.CHILDREN]; -var _i = 0; -repeat(array_length_1d(_child_array)) -{ - var _array = _child_array[_i]; - if (_array[__CHATTERBOX_CHILD.TYPE] == __CHATTERBOX_CHILD_TYPE.OPTION) _count++; - ++_i; -} + var _i = 0; + repeat(array_length_1d(_child_array)) + { + var _array = _child_array[_i]; + if (_array[__CHATTERBOX_CHILD.TYPE] == __CHATTERBOX_CHILD_TYPE.OPTION) _count++; + ++_i; + } + + return _count; -return _count; \ No newline at end of file + +} diff --git a/scripts/chatterbox_option_count/chatterbox_option_count.yy b/scripts/chatterbox_option_count/chatterbox_option_count.yy index 732f75da..f2d55f71 100644 --- a/scripts/chatterbox_option_count/chatterbox_option_count.yy +++ b/scripts/chatterbox_option_count/chatterbox_option_count.yy @@ -1,8 +1,12 @@ { - "id": "7ed6fdb0-1cb3-4158-9bd0-c37474248cac", - "modelName": "GMScript", - "mvc": "1.0", - "name": "chatterbox_option_count", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Chatterbox", + "path": "folders/Scripts/Chatterbox.yy", + }, + "resourceVersion": "1.0", + "name": "chatterbox_option_count", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_option_get/chatterbox_option_get.gml b/scripts/chatterbox_option_get/chatterbox_option_get.gml index 04202860..49e71312 100644 --- a/scripts/chatterbox_option_get/chatterbox_option_get.gml +++ b/scripts/chatterbox_option_get/chatterbox_option_get.gml @@ -1,23 +1,27 @@ /// @param chatterboxHost /// @param index +function chatterbox_option_get(argument0, argument1) { -var _chatterbox = argument0; -var _index = argument1; + var _chatterbox = argument0; + var _index = argument1; -var _count = 0; -var _child_array = _chatterbox[__CHATTERBOX_HOST.CHILDREN]; + var _count = 0; + var _child_array = _chatterbox[__CHATTERBOX_HOST.CHILDREN]; -var _i = 0; -repeat(array_length_1d(_child_array)) -{ - var _array = _child_array[ _i ]; - if (_array[__CHATTERBOX_CHILD.TYPE] == __CHATTERBOX_CHILD_TYPE.OPTION) - { - if (_count == _index) return _array[__CHATTERBOX_CHILD.STRING]; - _count++; - } + var _i = 0; + repeat(array_length_1d(_child_array)) + { + var _array = _child_array[ _i ]; + if (_array[__CHATTERBOX_CHILD.TYPE] == __CHATTERBOX_CHILD_TYPE.OPTION) + { + if (_count == _index) return _array[__CHATTERBOX_CHILD.STRING]; + _count++; + } - ++_i; -} + ++_i; + } + + return undefined; -return undefined; \ No newline at end of file + +} diff --git a/scripts/chatterbox_option_get/chatterbox_option_get.yy b/scripts/chatterbox_option_get/chatterbox_option_get.yy index bcd7c4ab..fd5ef4b6 100644 --- a/scripts/chatterbox_option_get/chatterbox_option_get.yy +++ b/scripts/chatterbox_option_get/chatterbox_option_get.yy @@ -1,8 +1,12 @@ { - "id": "3a73c356-b790-4ff3-9dde-6790b01ef8b2", - "modelName": "GMScript", - "mvc": "1.0", - "name": "chatterbox_option_get", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Chatterbox", + "path": "folders/Scripts/Chatterbox.yy", + }, + "resourceVersion": "1.0", + "name": "chatterbox_option_get", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_select/chatterbox_select.gml b/scripts/chatterbox_select/chatterbox_select.gml index a5af4324..198f0a34 100644 --- a/scripts/chatterbox_select/chatterbox_select.gml +++ b/scripts/chatterbox_select/chatterbox_select.gml @@ -6,583 +6,587 @@ /// /// @param chatterboxHost /// @param optionIndex +function chatterbox_select(argument0, argument1) { -var _chatterbox = argument0; -var _selected_index = argument1; + var _chatterbox = argument0; + var _selected_index = argument1; -var _node_title = _chatterbox[__CHATTERBOX_HOST.TITLE ]; -var _filename = _chatterbox[__CHATTERBOX_HOST.FILENAME ]; -var _child_array = _chatterbox[__CHATTERBOX_HOST.CHILDREN ]; -var _singleton_text = _chatterbox[__CHATTERBOX_HOST.SINGLETON_TEXT]; + var _node_title = _chatterbox[__CHATTERBOX_HOST.TITLE ]; + var _filename = _chatterbox[__CHATTERBOX_HOST.FILENAME ]; + var _child_array = _chatterbox[__CHATTERBOX_HOST.CHILDREN ]; + var _singleton_text = _chatterbox[__CHATTERBOX_HOST.SINGLETON_TEXT]; -if (_node_title == undefined) -{ - //If the node title is then this chatterbox has been stopped - exit; -} + if (_node_title == undefined) + { + //If the node title is then this chatterbox has been stopped + exit; + } -//VM state -var _key = _filename + CHATTERBOX_FILENAME_SEPARATOR + _node_title; -var _start_indent = 0; -var _indent_bottom_limit = 0; -var _text_instruction = 0; -var _start_instruction = global.__chatterbox_goto[? _key ]; -var _end_instruction = -1; -var _post_text = false; -var _scan_from_last_wait = false; -var _at_scan_end_instruction = false; -var _if_state = true; -var _permit_greater_indent = false; + //VM state + var _key = _filename + CHATTERBOX_FILENAME_SEPARATOR + _node_title; + var _start_indent = 0; + var _indent_bottom_limit = 0; + var _text_instruction = 0; + var _start_instruction = global.__chatterbox_goto[? _key ]; + var _end_instruction = -1; + var _post_text = false; + var _scan_from_last_wait = false; + var _at_scan_end_instruction = false; + var _if_state = true; + var _permit_greater_indent = false; -if (is_real(_selected_index)) -{ - //Scan through all children to find the selected option - var _array = undefined; - var _count = 0; - var _size = array_length_1d(_child_array); - for(var _i = 0; _i < _size; _i++) - { - var _array = _child_array[_i]; - if (_array[__CHATTERBOX_CHILD.TYPE] == __CHATTERBOX_CHILD_TYPE.OPTION) - { - if (_count == _selected_index) break; - _count++; - } - } + if (is_real(_selected_index)) + { + //Scan through all children to find the selected option + var _array = undefined; + var _count = 0; + var _size = array_length_1d(_child_array); + for(var _i = 0; _i < _size; _i++) + { + var _array = _child_array[_i]; + if (_array[__CHATTERBOX_CHILD.TYPE] == __CHATTERBOX_CHILD_TYPE.OPTION) + { + if (_count == _selected_index) break; + _count++; + } + } - //If we can't find the selected option, bail - if ((_i >= _size) || !is_array(_array)) - { - if (CHATTERBOX_DEBUG) __chatterbox_trace("Selected option (", _selected_index, ") could not be found. Total number of options is ", _count); - return false; - } + //If we can't find the selected option, bail + if ((_i >= _size) || !is_array(_array)) + { + if (CHATTERBOX_DEBUG) __chatterbox_trace("Selected option (", _selected_index, ") could not be found. Total number of options is ", _count); + return false; + } - var _start_instruction = _array[__CHATTERBOX_CHILD.INSTRUCTION_START]; - var _end_instruction = _array[__CHATTERBOX_CHILD.INSTRUCTION_END ]; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("start instruction = ", _start_instruction); - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("end instruction = ", _end_instruction); + var _start_instruction = _array[__CHATTERBOX_CHILD.INSTRUCTION_START]; + var _end_instruction = _array[__CHATTERBOX_CHILD.INSTRUCTION_END ]; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("start instruction = ", _start_instruction); + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("end instruction = ", _end_instruction); - _scan_from_last_wait = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("_scan_from_last_wait=", _scan_from_last_wait); + _scan_from_last_wait = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("_scan_from_last_wait=", _scan_from_last_wait); - var _array = global.__chatterbox_vm[| _start_instruction ]; - if (!is_array(_array)) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("Non-array: \"", _array, "\""); - } - else - { - _start_indent = _array[__CHATTERBOX_INSTRUCTION.INDENT]; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("start indent = ", _start_indent); - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("Starting scan from option index=", _selected_index, ", \"", _array[__CHATTERBOX_INSTRUCTION.CONTENT], "\""); - } + var _array = global.__chatterbox_vm[| _start_instruction ]; + if (!is_array(_array)) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("Non-array: \"", _array, "\""); + } + else + { + _start_indent = _array[__CHATTERBOX_INSTRUCTION.INDENT]; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("start indent = ", _start_indent); + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("Starting scan from option index=", _selected_index, ", \"", _array[__CHATTERBOX_INSTRUCTION.CONTENT], "\""); + } - _child_array = []; //Wipe all children - _chatterbox[@ __CHATTERBOX_HOST.CHILDREN] = _child_array; + _child_array = []; //Wipe all children + _chatterbox[@ __CHATTERBOX_HOST.CHILDREN] = _child_array; - var _instruction = _start_instruction; - var _indent = _start_indent; + var _instruction = _start_instruction; + var _indent = _start_indent; - var _break = false; - repeat(9999) - { - var _continue = false; - _at_scan_end_instruction = false; + var _break = false; + repeat(9999) + { + var _continue = false; + _at_scan_end_instruction = false; - var _instruction_array = global.__chatterbox_vm[| _instruction]; - if (!is_array(_instruction_array)) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("Non-array: \"", _instruction_array, "\""); - _instruction++; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("<- CONTINUE <-"); - continue; - } + var _instruction_array = global.__chatterbox_vm[| _instruction]; + if (!is_array(_instruction_array)) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("Non-array: \"", _instruction_array, "\""); + _instruction++; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("<- CONTINUE <-"); + continue; + } - var _instruction_type = _instruction_array[__CHATTERBOX_INSTRUCTION.TYPE ]; - var _instruction_indent = _instruction_array[__CHATTERBOX_INSTRUCTION.INDENT ]; - var _instruction_content = _instruction_array[__CHATTERBOX_INSTRUCTION.CONTENT]; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("instr", string_format(_instruction, 5, 0), " >> ", string_format(_instruction_indent, 2, 0), " ", _instruction_type, " ", ((!is_undefined(_instruction_content))? _instruction_content : "")); + var _instruction_type = _instruction_array[__CHATTERBOX_INSTRUCTION.TYPE ]; + var _instruction_indent = _instruction_array[__CHATTERBOX_INSTRUCTION.INDENT ]; + var _instruction_content = _instruction_array[__CHATTERBOX_INSTRUCTION.CONTENT]; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("instr", string_format(_instruction, 5, 0), " >> ", string_format(_instruction_indent, 2, 0), " ", _instruction_type, " ", ((!is_undefined(_instruction_content))? _instruction_content : "")); - if (_scan_from_last_wait) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _scan_from_last_wait == ", _scan_from_last_wait); + if (_scan_from_last_wait) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _scan_from_last_wait == ", _scan_from_last_wait); - if (_instruction == _end_instruction) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" ", _instruction, " == ", _end_instruction, ", scan end"); - _indent = _instruction_indent; - _scan_from_last_wait = false; - _at_scan_end_instruction = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" indent = ", _indent); - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _scan_from_last_wait = ", _scan_from_last_wait); - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _at_scan_end_instruction = ", _at_scan_end_instruction); - } - else if (_instruction > _end_instruction) - { - __chatterbox_error("VM instruction overstepped bounds!\n ", true); - _instruction = _end_instruction; - continue; - } - } + if (_instruction == _end_instruction) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" ", _instruction, " == ", _end_instruction, ", scan end"); + _indent = _instruction_indent; + _scan_from_last_wait = false; + _at_scan_end_instruction = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" indent = ", _indent); + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _scan_from_last_wait = ", _scan_from_last_wait); + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _at_scan_end_instruction = ", _at_scan_end_instruction); + } + else if (_instruction > _end_instruction) + { + __chatterbox_error("VM instruction overstepped bounds!\n ", true); + _instruction = _end_instruction; + continue; + } + } #region Identation - if (_instruction_indent < _indent) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" indent ", _instruction_indent, " < indent ", _indent); - if (!_post_text) - { - _indent = _instruction_indent; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" indent = ", _indent); - } - else if (_instruction_indent < _indent_bottom_limit) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" instruction indent ", _instruction_indent, " < _indent_bottom_limit ", _indent_bottom_limit); - _break = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" -> BREAK ->"); - } - } - else if (_instruction_indent > _indent) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" instruction indent ", _instruction_indent, " > indent " , _indent); - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _permit_greater_indent=", _permit_greater_indent); - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" indent difference=", _instruction_indent - _indent); - if (_permit_greater_indent && ((_instruction_indent - _indent) <= CHATTERBOX_INDENT_UNIT_SIZE)) - { - _indent = _instruction_indent; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" indent = ", _indent); - } - else - { - _continue = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); - } - } + if (_instruction_indent < _indent) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" indent ", _instruction_indent, " < indent ", _indent); + if (!_post_text) + { + _indent = _instruction_indent; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" indent = ", _indent); + } + else if (_instruction_indent < _indent_bottom_limit) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" instruction indent ", _instruction_indent, " < _indent_bottom_limit ", _indent_bottom_limit); + _break = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" -> BREAK ->"); + } + } + else if (_instruction_indent > _indent) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" instruction indent ", _instruction_indent, " > indent " , _indent); + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _permit_greater_indent=", _permit_greater_indent); + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" indent difference=", _instruction_indent - _indent); + if (_permit_greater_indent && ((_instruction_indent - _indent) <= CHATTERBOX_INDENT_UNIT_SIZE)) + { + _indent = _instruction_indent; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" indent = ", _indent); + } + else + { + _continue = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); + } + } - _permit_greater_indent = false; + _permit_greater_indent = false; #endregion #region Branching - if (!_break && !_continue) - { - switch(_instruction_type) - { - case __CHATTERBOX_VM_IF: - case __CHATTERBOX_VM_ELSEIF: - //Only evaluate the if-statement if we passed the previous check - if (_instruction_type == __CHATTERBOX_VM_IF) - { - if (!_if_state) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _if_state == " + string(_if_state)); - _continue = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); - break; - } - } - - //Only evaluate the elseif-statement if we failed the previous check - if (_instruction_type == __CHATTERBOX_VM_ELSEIF) - { - if (_if_state) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _if_state == ", _if_state); - _if_state = false; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _if_state = ", _if_state); - _continue = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); - break; - } - } - - var _result = __chatterbox_evaluate(_chatterbox, _instruction_content); - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" Evaluator returned \"" + string(_result) + "\" (" + typeof(_result) + ")"); - - if (!is_bool(_result) && !is_real(_result)) - { - __chatterbox_trace("WARNING! Expression evaluator returned an invalid datatype (" + typeof(_result) + ")"); - var _if_state = false; - } - else - { - var _if_state = _result; - } - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _if_state = " + string(_if_state)); - - if (_if_state) - { - _permit_greater_indent = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _permit_greater_indent = " + string(_permit_greater_indent)); - } - break; + if (!_break && !_continue) + { + switch(_instruction_type) + { + case __CHATTERBOX_VM_IF: + case __CHATTERBOX_VM_ELSEIF: + //Only evaluate the if-statement if we passed the previous check + if (_instruction_type == __CHATTERBOX_VM_IF) + { + if (!_if_state) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _if_state == " + string(_if_state)); + _continue = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); + break; + } + } + + //Only evaluate the elseif-statement if we failed the previous check + if (_instruction_type == __CHATTERBOX_VM_ELSEIF) + { + if (_if_state) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _if_state == ", _if_state); + _if_state = false; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _if_state = ", _if_state); + _continue = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); + break; + } + } + + var _result = __chatterbox_evaluate(_chatterbox, _instruction_content); + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" Evaluator returned \"" + string(_result) + "\" (" + typeof(_result) + ")"); + + if (!is_bool(_result) && !is_real(_result)) + { + __chatterbox_trace("WARNING! Expression evaluator returned an invalid datatype (" + typeof(_result) + ")"); + var _if_state = false; + } + else + { + var _if_state = _result; + } + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _if_state = " + string(_if_state)); + + if (_if_state) + { + _permit_greater_indent = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _permit_greater_indent = " + string(_permit_greater_indent)); + } + break; - case __CHATTERBOX_VM_ELSE: - _if_state = !_if_state; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" Invert _if_state = " + string(_if_state)); - - if (_if_state) - { - _permit_greater_indent = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _permit_greater_indent = " + string(_permit_greater_indent)); - } - break; + case __CHATTERBOX_VM_ELSE: + _if_state = !_if_state; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" Invert _if_state = " + string(_if_state)); + + if (_if_state) + { + _permit_greater_indent = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _permit_greater_indent = " + string(_permit_greater_indent)); + } + break; - case __CHATTERBOX_VM_ENDIF: - _if_state = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _if_state = " + string(_if_state)); - break; - } + case __CHATTERBOX_VM_ENDIF: + _if_state = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _if_state = " + string(_if_state)); + break; + } - } + } - if (!_break && !_continue) - { - //If we're inside a branch that has been evaluated as then keep skipping until we close the branch - if (!_if_state) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _if_state == " + string(_if_state)); - _continue = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); - } - } + if (!_break && !_continue) + { + //If we're inside a branch that has been evaluated as then keep skipping until we close the branch + if (!_if_state) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _if_state == " + string(_if_state)); + _continue = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); + } + } #endregion - if (!_break && !_continue) - { - var _new_option = false; - var _new_option_text = ""; - switch(_instruction_type) - { - case __CHATTERBOX_VM_WAIT: + if (!_break && !_continue) + { + var _new_option = false; + var _new_option_text = ""; + switch(_instruction_type) + { + case __CHATTERBOX_VM_WAIT: #region Wait - if (_post_text) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); - _break = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" -> BREAK ->"); - break; - } + if (_post_text) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); + _break = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" -> BREAK ->"); + break; + } #endregion - break; + break; - case __CHATTERBOX_VM_TEXT: + case __CHATTERBOX_VM_TEXT: #region Text - if (_scan_from_last_wait) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _scan_from_last_wait == " + string(_scan_from_last_wait)); - _continue = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); - break; - } + if (_scan_from_last_wait) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _scan_from_last_wait == " + string(_scan_from_last_wait)); + _continue = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); + break; + } - if (_post_text && _singleton_text) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); - _break = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" -> BREAK ->"); - break; - } + if (_post_text && _singleton_text) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); + _break = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" -> BREAK ->"); + break; + } - _post_text = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text = " + string(_post_text)); + _post_text = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text = " + string(_post_text)); - var _new_array = array_create(__CHATTERBOX_CHILD.__SIZE); - _new_array[@ __CHATTERBOX_CHILD.STRING ] = _instruction_content[0]; - _new_array[@ __CHATTERBOX_CHILD.TYPE ] = __CHATTERBOX_CHILD_TYPE.BODY; - _new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_START] = undefined; - _new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_END ] = undefined; - _child_array[@ array_length_1d(_child_array) ] = _new_array; + var _new_array = array_create(__CHATTERBOX_CHILD.__SIZE); + _new_array[@ __CHATTERBOX_CHILD.STRING ] = _instruction_content[0]; + _new_array[@ __CHATTERBOX_CHILD.TYPE ] = __CHATTERBOX_CHILD_TYPE.BODY; + _new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_START] = undefined; + _new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_END ] = undefined; + _child_array[@ array_length_1d(_child_array) ] = _new_array; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" Added body string \"", _instruction_content[0], "\""); + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" Added body string \"", _instruction_content[0], "\""); - var _text_instruction = _instruction; //Record the instruction position of the text + var _text_instruction = _instruction; //Record the instruction position of the text - _indent_bottom_limit = _instruction_indent; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _indent_for_options = " + string(_indent_bottom_limit)); + _indent_bottom_limit = _instruction_indent; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _indent_for_options = " + string(_indent_bottom_limit)); #endregion - break; + break; - case __CHATTERBOX_VM_REDIRECT: + case __CHATTERBOX_VM_REDIRECT: #region Redirect - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); - if (_post_text) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" -> BREAK ->"); - _break = true; - break; - } - else - { - var _string = _instruction_content[0]; - var _pos = string_pos(CHATTERBOX_FILENAME_SEPARATOR, _string); - if (_pos > 0) - { - _filename = string_copy(_string, 1, _pos-1); - _node_title = string_delete(_string, 1, _pos); - } - else - { - _node_title = _string; - } + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); + if (_post_text) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" -> BREAK ->"); + _break = true; + break; + } + else + { + var _string = _instruction_content[0]; + var _pos = string_pos(CHATTERBOX_FILENAME_SEPARATOR, _string); + if (_pos > 0) + { + _filename = string_copy(_string, 1, _pos-1); + _node_title = string_delete(_string, 1, _pos); + } + else + { + _node_title = _string; + } - _chatterbox[@ __CHATTERBOX_HOST.TITLE ] = _node_title; - _chatterbox[@ __CHATTERBOX_HOST.FILENAME ] = _filename; + _chatterbox[@ __CHATTERBOX_HOST.TITLE ] = _node_title; + _chatterbox[@ __CHATTERBOX_HOST.FILENAME ] = _filename; - var _key = _filename + CHATTERBOX_FILENAME_SEPARATOR + _node_title; - CHATTERBOX_VARIABLES_MAP[? "visited(" + _key + ")" ] = true; - if (CHATTERBOX_DEBUG) __chatterbox_trace(" \"visited(" + _key + ")\" to "); + var _key = _filename + CHATTERBOX_FILENAME_SEPARATOR + _node_title; + CHATTERBOX_VARIABLES_MAP[? "visited(" + _key + ")" ] = true; + if (CHATTERBOX_DEBUG) __chatterbox_trace(" \"visited(" + _key + ")\" to "); - if (!ds_map_exists(global.__chatterbox_goto, _key)) - { - if (!ds_map_exists(global.__chatterbox_file_data, _filename)) - { - __chatterbox_error("File \"" + string(_filename) + "\" not initialised.\n ", true); - exit; - } - else - { - __chatterbox_error("Node title \"" + string(_node_title) + "\" not found in file \"" + string(_filename) + "\".\n ", true); - exit; - } - } + if (!ds_map_exists(global.__chatterbox_goto, _key)) + { + if (!ds_map_exists(global.__chatterbox_file_data, _filename)) + { + __chatterbox_error("File \"" + string(_filename) + "\" not initialised.\n ", true); + exit; + } + else + { + __chatterbox_error("Node title \"" + string(_node_title) + "\" not found in file \"" + string(_filename) + "\".\n ", true); + exit; + } + } - //Partially reset state - var _text_instruction = -1; - var _instruction = global.__chatterbox_goto[? _key ]-1; - var _end_instruction = -1; - var _if_state = true; - var _permit_greater_indent = false; - var _at_scan_end_instruction = false; + //Partially reset state + var _text_instruction = -1; + var _instruction = global.__chatterbox_goto[? _key ]-1; + var _end_instruction = -1; + var _if_state = true; + var _permit_greater_indent = false; + var _at_scan_end_instruction = false; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("Jumping to " + string(_key) + ", instruction = " + string(_instruction) + " (inc. -1 offset)" ); + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("Jumping to " + string(_key) + ", instruction = " + string(_instruction) + " (inc. -1 offset)" ); - var _instruction_array = global.__chatterbox_vm[| _instruction+1]; - _indent = _instruction_array[ __CHATTERBOX_INSTRUCTION.INDENT ]; - _indent_bottom_limit = 0; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("indent = " + string(_indent)); + var _instruction_array = global.__chatterbox_vm[| _instruction+1]; + _indent = _instruction_array[ __CHATTERBOX_INSTRUCTION.INDENT ]; + _indent_bottom_limit = 0; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("indent = " + string(_indent)); - _continue = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); - break; - } + _continue = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); + break; + } #endregion - break; + break; - case __CHATTERBOX_VM_OPTION: + case __CHATTERBOX_VM_OPTION: #region Option - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); - if (!_post_text) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _at_scan_end_instruction == " + string(_at_scan_end_instruction)); - if (_at_scan_end_instruction) - { - _node_title = _instruction_content[1]; - _chatterbox[@ __CHATTERBOX_HOST.TITLE] = _node_title; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); + if (!_post_text) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _at_scan_end_instruction == " + string(_at_scan_end_instruction)); + if (_at_scan_end_instruction) + { + _node_title = _instruction_content[1]; + _chatterbox[@ __CHATTERBOX_HOST.TITLE] = _node_title; - var _key = _filename + CHATTERBOX_FILENAME_SEPARATOR + _node_title; - CHATTERBOX_VARIABLES_MAP[? "visited(" + _key + ")" ] = true; - if (CHATTERBOX_DEBUG) __chatterbox_trace(" \"visited(" + _key + ")\" to "); + var _key = _filename + CHATTERBOX_FILENAME_SEPARATOR + _node_title; + CHATTERBOX_VARIABLES_MAP[? "visited(" + _key + ")" ] = true; + if (CHATTERBOX_DEBUG) __chatterbox_trace(" \"visited(" + _key + ")\" to "); - if (!ds_map_exists(global.__chatterbox_goto, _key)) - { - if (!ds_map_exists(global.__chatterbox_file_data, _filename)) - { - __chatterbox_error("File \"" + string(_filename) + "\" not initialised.\n ", true); - exit; - } - else - { - __chatterbox_error("Node title \"" + string(_node_title) + "\" not found in file \"" + string(_filename) + "\".\n ", true); - exit; - } - } + if (!ds_map_exists(global.__chatterbox_goto, _key)) + { + if (!ds_map_exists(global.__chatterbox_file_data, _filename)) + { + __chatterbox_error("File \"" + string(_filename) + "\" not initialised.\n ", true); + exit; + } + else + { + __chatterbox_error("Node title \"" + string(_node_title) + "\" not found in file \"" + string(_filename) + "\".\n ", true); + exit; + } + } - //Partially reset state - var _text_instruction = -1; - var _instruction = global.__chatterbox_goto[? _key]-1; - var _end_instruction = -1; - var _if_state = true; - var _permit_greater_indent = false; - var _at_scan_end_instruction = false; + //Partially reset state + var _text_instruction = -1; + var _instruction = global.__chatterbox_goto[? _key]-1; + var _end_instruction = -1; + var _if_state = true; + var _permit_greater_indent = false; + var _at_scan_end_instruction = false; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" >>> JUMP >>> " + string(_key) + ", instruction = " + string(_instruction) + " (inc. -1 offset)"); + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" >>> JUMP >>> " + string(_key) + ", instruction = " + string(_instruction) + " (inc. -1 offset)"); - var _instruction_array = global.__chatterbox_vm[| _instruction+1]; - _indent = _instruction_array[ __CHATTERBOX_INSTRUCTION.INDENT ]; - _indent_bottom_limit = 0; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("indent = " + string(_indent)); - } + var _instruction_array = global.__chatterbox_vm[| _instruction+1]; + _indent = _instruction_array[ __CHATTERBOX_INSTRUCTION.INDENT ]; + _indent_bottom_limit = 0; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace("indent = " + string(_indent)); + } - _continue = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); - break; - } + _continue = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); + break; + } - _indent_bottom_limit = _instruction_indent; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _indent_for_options = " + string(_indent_bottom_limit)); + _indent_bottom_limit = _instruction_indent; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _indent_for_options = " + string(_indent_bottom_limit)); - _new_option = true; - _new_option_text = _instruction_content[0]; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" New option \"" + string(_new_option_text) + "\""); + _new_option = true; + _new_option_text = _instruction_content[0]; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" New option \"" + string(_new_option_text) + "\""); #endregion - break; + break; - case __CHATTERBOX_VM_SHORTCUT: + case __CHATTERBOX_VM_SHORTCUT: #region Shortcut - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); - if (!_post_text) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" instruction=" + string(_instruction) + " vs. end=" + string(_end_instruction)); - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" indent=" + string(_indent) + " >= start=" + string(_start_indent)); - if ((_instruction == _end_instruction) && (_indent >= _start_indent)) - { - _permit_greater_indent = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _permit_greater_indent = " + string(_permit_greater_indent)); - } + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); + if (!_post_text) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" instruction=" + string(_instruction) + " vs. end=" + string(_end_instruction)); + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" indent=" + string(_indent) + " >= start=" + string(_start_indent)); + if ((_instruction == _end_instruction) && (_indent >= _start_indent)) + { + _permit_greater_indent = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _permit_greater_indent = " + string(_permit_greater_indent)); + } - _continue = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); - break; - } + _continue = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); + break; + } - _indent_bottom_limit = _instruction_indent; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _indent_for_options = " + string(_indent_bottom_limit)); + _indent_bottom_limit = _instruction_indent; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _indent_for_options = " + string(_indent_bottom_limit)); - _new_option = true; - _new_option_text = _instruction_content[0]; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" New option \"" + string(_new_option_text) + "\""); + _new_option = true; + _new_option_text = _instruction_content[0]; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" New option \"" + string(_new_option_text) + "\""); #endregion - break; + break; - case __CHATTERBOX_VM_SET: + case __CHATTERBOX_VM_SET: #region Set - if (_post_text) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); - _continue = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); - break; - } + if (_post_text) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); + _continue = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); + break; + } - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" now executing"); - __chatterbox_evaluate(_chatterbox, _instruction_content); + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" now executing"); + __chatterbox_evaluate(_chatterbox, _instruction_content); #endregion - break; + break; - case __CHATTERBOX_VM_CUSTOM_ACTION: + case __CHATTERBOX_VM_CUSTOM_ACTION: #region Custom Action - if (_post_text) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); - _continue = true; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); - break; - } + if (_post_text) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); + _continue = true; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" <- CONTINUE <-"); + break; + } - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" now executing"); + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" now executing"); - var _argument_array = array_create(array_length_1d(_instruction_content)-3); - array_copy(_argument_array, 0, _instruction_content, 3, array_length_1d(_instruction_content)-3); + var _argument_array = array_create(array_length_1d(_instruction_content)-3); + array_copy(_argument_array, 0, _instruction_content, 3, array_length_1d(_instruction_content)-3); - var _i = 0; - repeat(array_length_1d(_argument_array)) - { - _argument_array[_i] = __chatterbox_resolve_value(_chatterbox, _argument_array[_i]); - _i++; - } + var _i = 0; + repeat(array_length_1d(_argument_array)) + { + _argument_array[_i] = __chatterbox_resolve_value(_chatterbox, _argument_array[_i]); + _i++; + } - script_execute(global.__chatterbox_actions[? _instruction_content[0] ], _argument_array); + script_execute(global.__chatterbox_actions[? _instruction_content[0] ], _argument_array); #endregion - break; + break; - case __CHATTERBOX_VM_STOP: + case __CHATTERBOX_VM_STOP: #region Stop - if (_post_text) - { - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" -> BREAK ->"); - _break = true; - break; - } + if (_post_text) + { + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" -> BREAK ->"); + _break = true; + break; + } - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); - _chatterbox[@ __CHATTERBOX_HOST.TITLE ] = undefined; - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" !! STOP !!"); - exit; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" _post_text == " + string(_post_text)); + _chatterbox[@ __CHATTERBOX_HOST.TITLE ] = undefined; + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" !! STOP !!"); + exit; #endregion - break; + break; - case __CHATTERBOX_VM_GENERIC_ACTION: - if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" WARNING! Generic action called"); - break; - } + case __CHATTERBOX_VM_GENERIC_ACTION: + if (CHATTERBOX_DEBUG_SELECT) __chatterbox_trace(" WARNING! Generic action called"); + break; + } #region Create a new option from SHORTCUT and OPTION instructions - if (_new_option) - { - _new_option = false; + if (_new_option) + { + _new_option = false; - var _new_array = array_create(__CHATTERBOX_CHILD.__SIZE); - _child_array[@ array_length_1d(_child_array)] = _new_array; - _new_array[@ __CHATTERBOX_CHILD.STRING ] = _new_option_text; - _new_array[@ __CHATTERBOX_CHILD.TYPE ] = __CHATTERBOX_CHILD_TYPE.OPTION; - _new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_START] = _text_instruction; - _new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_END ] = _instruction; - } + var _new_array = array_create(__CHATTERBOX_CHILD.__SIZE); + _child_array[@ array_length_1d(_child_array)] = _new_array; + _new_array[@ __CHATTERBOX_CHILD.STRING ] = _new_option_text; + _new_array[@ __CHATTERBOX_CHILD.TYPE ] = __CHATTERBOX_CHILD_TYPE.OPTION; + _new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_START] = _text_instruction; + _new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_END ] = _instruction; + } #endregion - } + } - if (_break) break; + if (_break) break; - _instruction++; - } + _instruction++; + } - if (CHATTERBOX_OPTION_FALLBACK_ENABLE) - { + if (CHATTERBOX_OPTION_FALLBACK_ENABLE) + { #region Create a new option from a TEXT instruction if no option or shortcut was found - //Scan through all children to find the selected option - var _size = array_length_1d(_child_array); - for(var _i = 0; _i < _size; _i++) - { - var _array = _child_array[ _i ]; - if (_array[ __CHATTERBOX_CHILD.TYPE ] == __CHATTERBOX_CHILD_TYPE.OPTION) break; - } + //Scan through all children to find the selected option + var _size = array_length_1d(_child_array); + for(var _i = 0; _i < _size; _i++) + { + var _array = _child_array[ _i ]; + if (_array[ __CHATTERBOX_CHILD.TYPE ] == __CHATTERBOX_CHILD_TYPE.OPTION) break; + } - if (_i >= _size) - { - //We haven't found an option so we should create one! - var _new_array = array_create(__CHATTERBOX_CHILD.__SIZE); - _new_array[@ __CHATTERBOX_CHILD.STRING ] = CHATTERBOX_OPTION_FALLBACK_TEXT; - _new_array[@ __CHATTERBOX_CHILD.TYPE ] = __CHATTERBOX_CHILD_TYPE.OPTION; - _new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_START] = _text_instruction; - _new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_END ] = _instruction; - _child_array[@ array_length_1d(_child_array)] = _new_array; - } + if (_i >= _size) + { + //We haven't found an option so we should create one! + var _new_array = array_create(__CHATTERBOX_CHILD.__SIZE); + _new_array[@ __CHATTERBOX_CHILD.STRING ] = CHATTERBOX_OPTION_FALLBACK_TEXT; + _new_array[@ __CHATTERBOX_CHILD.TYPE ] = __CHATTERBOX_CHILD_TYPE.OPTION; + _new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_START] = _text_instruction; + _new_array[@ __CHATTERBOX_CHILD.INSTRUCTION_END ] = _instruction; + _child_array[@ array_length_1d(_child_array)] = _new_array; + } #endregion - } + } - return true; -} + return true; + } + + return false; -return false; \ No newline at end of file + +} diff --git a/scripts/chatterbox_select/chatterbox_select.yy b/scripts/chatterbox_select/chatterbox_select.yy index 4b9be269..07c3905b 100644 --- a/scripts/chatterbox_select/chatterbox_select.yy +++ b/scripts/chatterbox_select/chatterbox_select.yy @@ -1,8 +1,12 @@ { - "id": "881dd845-b97a-4dce-a3fe-1ad4ded0084f", - "modelName": "GMScript", - "mvc": "1.0", - "name": "chatterbox_select", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Chatterbox", + "path": "folders/Scripts/Chatterbox.yy", + }, + "resourceVersion": "1.0", + "name": "chatterbox_select", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/suspend_dialogue/suspend_dialogue.gml b/scripts/suspend_dialogue/suspend_dialogue.gml index 34dc47a4..0bdac734 100644 --- a/scripts/suspend_dialogue/suspend_dialogue.gml +++ b/scripts/suspend_dialogue/suspend_dialogue.gml @@ -1,5 +1,9 @@ /// @param argumentArray +function suspend_dialogue(argument0) { -var _argument_array = argument0; //Not used in this script + var _argument_array = argument0; //Not used in this script -suspend = true; \ No newline at end of file + suspend = true; + + +} diff --git a/scripts/suspend_dialogue/suspend_dialogue.yy b/scripts/suspend_dialogue/suspend_dialogue.yy index 50928f78..a4004308 100644 --- a/scripts/suspend_dialogue/suspend_dialogue.yy +++ b/scripts/suspend_dialogue/suspend_dialogue.yy @@ -1,8 +1,12 @@ { - "id": "5035acc2-d809-4bf5-b251-ea72c52874d4", - "modelName": "GMScript", - "mvc": "1.0", - "name": "suspend_dialogue", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, + "resourceVersion": "1.0", + "name": "suspend_dialogue", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/views/013729a3-ac01-4ec9-ae9f-defcd9f03fd6.yy b/views/013729a3-ac01-4ec9-ae9f-defcd9f03fd6.yy deleted file mode 100644 index 98817572..00000000 --- a/views/013729a3-ac01-4ec9-ae9f-defcd9f03fd6.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "013729a3-ac01-4ec9-ae9f-defcd9f03fd6", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "013729a3-ac01-4ec9-ae9f-defcd9f03fd6", - "children": [ - - ], - "filterType": "GMConfig", - "folderName": "configs", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Configs" -} \ No newline at end of file diff --git a/views/0983f652-6ae8-4dd0-b1df-11881acb290e.yy b/views/0983f652-6ae8-4dd0-b1df-11881acb290e.yy deleted file mode 100644 index 831c26d2..00000000 --- a/views/0983f652-6ae8-4dd0-b1df-11881acb290e.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "0983f652-6ae8-4dd0-b1df-11881acb290e", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "0983f652-6ae8-4dd0-b1df-11881acb290e", - "children": [ - - ], - "filterType": "GMSound", - "folderName": "sounds", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Sounds" -} \ No newline at end of file diff --git a/views/0bd17290-248f-4321-ab5a-f82c01bc2fbf.yy b/views/0bd17290-248f-4321-ab5a-f82c01bc2fbf.yy deleted file mode 100644 index 5f0b1662..00000000 --- a/views/0bd17290-248f-4321-ab5a-f82c01bc2fbf.yy +++ /dev/null @@ -1,18 +0,0 @@ -{ - "id": "0bd17290-248f-4321-ab5a-f82c01bc2fbf", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "0bd17290-248f-4321-ab5a-f82c01bc2fbf", - "children": [ - "ffc75b87-7243-4a9b-8f82-a7aec1b436ba", - "48de0644-428c-4f83-84dc-d8f4ed174f63", - "f15d55bc-151d-4270-b176-8a9a3e0115da", - "7078f18e-cab5-4718-9cff-70420fb20d03", - "36f2c371-0af7-4281-bef1-c48ce4fbbb54", - "2b5b6d64-5f87-44f3-8400-534c8e1cc91c" - ], - "filterType": "GMScript", - "folderName": "Setup", - "isDefaultView": false, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/1b8a0e6b-905e-4f98-85d3-5b11498b4042.yy b/views/1b8a0e6b-905e-4f98-85d3-5b11498b4042.yy deleted file mode 100644 index a753354f..00000000 --- a/views/1b8a0e6b-905e-4f98-85d3-5b11498b4042.yy +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "1b8a0e6b-905e-4f98-85d3-5b11498b4042", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "1b8a0e6b-905e-4f98-85d3-5b11498b4042", - "children": [ - "6f508094-c871-48eb-a955-07e2b6794dac", - "e7f86093-cebc-4ca5-ac72-b9e0a305ba95", - "5dbb4614-c49b-4056-8ef0-5531f8ec6484" - ], - "filterType": "GMIncludedFile", - "folderName": "Yarn", - "isDefaultView": false, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/2b5b6d64-5f87-44f3-8400-534c8e1cc91c.yy b/views/2b5b6d64-5f87-44f3-8400-534c8e1cc91c.yy deleted file mode 100644 index ea491ac9..00000000 --- a/views/2b5b6d64-5f87-44f3-8400-534c8e1cc91c.yy +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "2b5b6d64-5f87-44f3-8400-534c8e1cc91c", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "2b5b6d64-5f87-44f3-8400-534c8e1cc91c", - "children": [ - "d25ff5fc-73bc-48eb-ad5c-e3a6cb63937e", - "872012ae-b0bc-44c4-bc46-bf0e03659e62", - "6a735733-e38d-4fc8-ad9e-24d8b97c6adb" - ], - "filterType": "GMScript", - "folderName": "Extra", - "isDefaultView": false, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/3a479606-3abc-4c0a-ba65-b8a104c61c52.yy b/views/3a479606-3abc-4c0a-ba65-b8a104c61c52.yy deleted file mode 100644 index d31c586c..00000000 --- a/views/3a479606-3abc-4c0a-ba65-b8a104c61c52.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "3a479606-3abc-4c0a-ba65-b8a104c61c52", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "3a479606-3abc-4c0a-ba65-b8a104c61c52", - "children": [ - - ], - "filterType": "GMTileSet", - "folderName": "tilesets", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Tilesets" -} \ No newline at end of file diff --git a/views/426a5290-5eb6-446f-be10-7e9300c94750.yy b/views/426a5290-5eb6-446f-be10-7e9300c94750.yy deleted file mode 100644 index 2ff31d23..00000000 --- a/views/426a5290-5eb6-446f-be10-7e9300c94750.yy +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id": "426a5290-5eb6-446f-be10-7e9300c94750", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "426a5290-5eb6-446f-be10-7e9300c94750", - "children": [ - "f7061cd5-abb7-47d5-9afb-0c61c4101a56", - "60990149-1dae-4f22-88d9-53025cbd7878", - "5a2bd88b-bb45-42ce-b065-697aa4e45e60", - "511b43eb-944f-4793-a978-5172325a27b0", - "0728437b-b2e3-4875-bbba-74bc28b777b0", - "1c424e6a-baa6-493c-be83-daf99575559b", - "e808db90-cb59-47eb-bd8f-ff2d1072801a", - "fb0ac65c-2f27-415b-806a-ba3ed448100d", - "211c822a-303c-4c26-ad78-e2435f3a28a2" - ], - "filterType": "GMScript", - "folderName": "__Private", - "isDefaultView": false, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/503cf607-27a8-45bf-a70c-c4f6011d4644.yy b/views/503cf607-27a8-45bf-a70c-c4f6011d4644.yy deleted file mode 100644 index ff15b984..00000000 --- a/views/503cf607-27a8-45bf-a70c-c4f6011d4644.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "503cf607-27a8-45bf-a70c-c4f6011d4644", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "503cf607-27a8-45bf-a70c-c4f6011d4644", - "children": [ - - ], - "filterType": "GMFont", - "folderName": "fonts", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Fonts" -} \ No newline at end of file diff --git a/views/5f87550b-7fb8-44c6-b07e-5cd3c4197c31.yy b/views/5f87550b-7fb8-44c6-b07e-5cd3c4197c31.yy deleted file mode 100644 index ce18f662..00000000 --- a/views/5f87550b-7fb8-44c6-b07e-5cd3c4197c31.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "5f87550b-7fb8-44c6-b07e-5cd3c4197c31", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "5f87550b-7fb8-44c6-b07e-5cd3c4197c31", - "children": [ - - ], - "filterType": "GMSprite", - "folderName": "sprites", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Sprites" -} \ No newline at end of file diff --git a/views/73d76eff-c580-4c7f-8a7a-50753795d711.yy b/views/73d76eff-c580-4c7f-8a7a-50753795d711.yy deleted file mode 100644 index 26284a99..00000000 --- a/views/73d76eff-c580-4c7f-8a7a-50753795d711.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "73d76eff-c580-4c7f-8a7a-50753795d711", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "73d76eff-c580-4c7f-8a7a-50753795d711", - "children": [ - "1b8a0e6b-905e-4f98-85d3-5b11498b4042" - ], - "filterType": "GMIncludedFile", - "folderName": "datafiles", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_IncludedFiles" -} \ No newline at end of file diff --git a/views/84f15521-954c-4d2d-9709-5b2d9ca231f1.yy b/views/84f15521-954c-4d2d-9709-5b2d9ca231f1.yy deleted file mode 100644 index ed48235c..00000000 --- a/views/84f15521-954c-4d2d-9709-5b2d9ca231f1.yy +++ /dev/null @@ -1,14 +0,0 @@ -{ - "id": "84f15521-954c-4d2d-9709-5b2d9ca231f1", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "84f15521-954c-4d2d-9709-5b2d9ca231f1", - "children": [ - "8e242548-7b78-464a-bb38-54a74acce8a4", - "7887bc75-4b33-4846-bd70-275cf18456f4" - ], - "filterType": "GMRoom", - "folderName": "rooms", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Rooms" -} \ No newline at end of file diff --git a/views/89d48886-20f5-4316-bc9c-1908defb08ac.yy b/views/89d48886-20f5-4316-bc9c-1908defb08ac.yy deleted file mode 100644 index 20bcaa36..00000000 --- a/views/89d48886-20f5-4316-bc9c-1908defb08ac.yy +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "89d48886-20f5-4316-bc9c-1908defb08ac", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "89d48886-20f5-4316-bc9c-1908defb08ac", - "children": [ - "79bdef1e-caad-4a90-86ce-7360d93b86a8", - "84f6b7ba-9a5a-4882-8ab1-0f577bbb590f", - "c2d60cf9-ffb4-42bd-a0c7-c7cf77ca5452" - ], - "filterType": "GMIncludedFile", - "folderName": "Fonts", - "isDefaultView": false, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/8af41d37-ecf9-419b-baf8-12de7445f9cf.yy b/views/8af41d37-ecf9-419b-baf8-12de7445f9cf.yy deleted file mode 100644 index be47f7aa..00000000 --- a/views/8af41d37-ecf9-419b-baf8-12de7445f9cf.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "id": "8af41d37-ecf9-419b-baf8-12de7445f9cf", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "8af41d37-ecf9-419b-baf8-12de7445f9cf", - "children": [ - "ed6a955d-5826-4f98-a450-10b414266c27", - "f418569b-3bdd-4706-a0e4-364317f54032", - "cc98d028-7bdd-4680-85f3-c87a7baa481e", - "75ac291e-7061-4bcb-8e8a-3b3545332d41", - "a9188620-a624-4a5a-83ae-a1b53faf038b", - "3a5af38c-757d-44ae-98c0-5d4b09e14e6a", - "e42bf5cc-3f46-4d67-a6d0-a4885a11ac3f", - "a128950b-5063-4876-b4a6-b99dbd2ea6d1", - "8427047f-9ef8-4c77-89f3-9c20623d07b6", - "7e093a2a-e51c-4a1e-9a53-f9080d38730b", - "3a5af38c-757d-41ae-98c0-5d4b09e14e6a", - "93566aad-c3b3-48a9-8fa7-9c5ee19f74ac", - "f85efd3d-bcec-4ec0-8226-da808afda79d" - ], - "filterType": "GMOptions", - "folderName": "options", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Options" -} \ No newline at end of file diff --git a/views/946479bd-e52d-41cb-994f-9184d806b8b5.yy b/views/946479bd-e52d-41cb-994f-9184d806b8b5.yy deleted file mode 100644 index 49358c69..00000000 --- a/views/946479bd-e52d-41cb-994f-9184d806b8b5.yy +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "946479bd-e52d-41cb-994f-9184d806b8b5", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "946479bd-e52d-41cb-994f-9184d806b8b5", - "children": [ - "f0d55121-d1e8-45b8-ac57-b1a98bfb38a3", - "8f58bbbe-3dba-44de-b201-00643bc3496c", - "6ea95fbf-928f-40c7-b8cf-3569b68beb05" - ], - "filterType": "GMObject", - "folderName": "objects", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Objects" -} \ No newline at end of file diff --git a/views/9a14b894-4693-4a4a-a152-7ede094c183a.yy b/views/9a14b894-4693-4a4a-a152-7ede094c183a.yy deleted file mode 100644 index b1cbe843..00000000 --- a/views/9a14b894-4693-4a4a-a152-7ede094c183a.yy +++ /dev/null @@ -1,27 +0,0 @@ -{ - "id": "9a14b894-4693-4a4a-a152-7ede094c183a", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "9a14b894-4693-4a4a-a152-7ede094c183a", - "children": [ - "5f87550b-7fb8-44c6-b07e-5cd3c4197c31", - "3a479606-3abc-4c0a-ba65-b8a104c61c52", - "0983f652-6ae8-4dd0-b1df-11881acb290e", - "d31795bd-3e13-4c6b-bec6-ccf6cfdf0bce", - "f86819ac-c627-4fd4-95a4-0e87a325a6ff", - "c459431b-207e-415b-b3a7-92d0d49053d1", - "503cf607-27a8-45bf-a70c-c4f6011d4644", - "a9c1c006-82cc-4168-94cf-cda9593ef14e", - "946479bd-e52d-41cb-994f-9184d806b8b5", - "84f15521-954c-4d2d-9709-5b2d9ca231f1", - "b1d302c2-0fa0-4efb-8e77-0aa33c500be6", - "73d76eff-c580-4c7f-8a7a-50753795d711", - "df3afc9f-820f-420b-b9b5-ed2c2222c392", - "8af41d37-ecf9-419b-baf8-12de7445f9cf", - "013729a3-ac01-4ec9-ae9f-defcd9f03fd6" - ], - "filterType": "root", - "folderName": "Default", - "isDefaultView": true, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/9b08d9da-d0f3-4c56-adba-dd0ede8285f6.yy b/views/9b08d9da-d0f3-4c56-adba-dd0ede8285f6.yy deleted file mode 100644 index ff500618..00000000 --- a/views/9b08d9da-d0f3-4c56-adba-dd0ede8285f6.yy +++ /dev/null @@ -1,16 +0,0 @@ -{ - "id": "9b08d9da-d0f3-4c56-adba-dd0ede8285f6", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "9b08d9da-d0f3-4c56-adba-dd0ede8285f6", - "children": [ - "633d7395-f018-4c16-a188-1281be2d8da8", - "e27a3260-8000-4846-bd5c-f14e05d20a49", - "d922db80-2bdc-4bd0-bf27-d2b8d139e448", - "8c053dc1-a3f7-4d8a-b929-e87126b0ee81" - ], - "filterType": "GMIncludedFile", - "folderName": "Fonts", - "isDefaultView": false, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/a9c1c006-82cc-4168-94cf-cda9593ef14e.yy b/views/a9c1c006-82cc-4168-94cf-cda9593ef14e.yy deleted file mode 100644 index 94d31b28..00000000 --- a/views/a9c1c006-82cc-4168-94cf-cda9593ef14e.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "a9c1c006-82cc-4168-94cf-cda9593ef14e", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "a9c1c006-82cc-4168-94cf-cda9593ef14e", - "children": [ - - ], - "filterType": "GMTimeline", - "folderName": "timelines", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Timelines" -} \ No newline at end of file diff --git a/views/b1d302c2-0fa0-4efb-8e77-0aa33c500be6.yy b/views/b1d302c2-0fa0-4efb-8e77-0aa33c500be6.yy deleted file mode 100644 index eea7f187..00000000 --- a/views/b1d302c2-0fa0-4efb-8e77-0aa33c500be6.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "b1d302c2-0fa0-4efb-8e77-0aa33c500be6", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "b1d302c2-0fa0-4efb-8e77-0aa33c500be6", - "children": [ - - ], - "filterType": "GMNotes", - "folderName": "notes", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Notes" -} \ No newline at end of file diff --git a/views/c459431b-207e-415b-b3a7-92d0d49053d1.yy b/views/c459431b-207e-415b-b3a7-92d0d49053d1.yy deleted file mode 100644 index a43d65a4..00000000 --- a/views/c459431b-207e-415b-b3a7-92d0d49053d1.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "c459431b-207e-415b-b3a7-92d0d49053d1", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "c459431b-207e-415b-b3a7-92d0d49053d1", - "children": [ - - ], - "filterType": "GMShader", - "folderName": "shaders", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Shaders" -} \ No newline at end of file diff --git a/views/d31795bd-3e13-4c6b-bec6-ccf6cfdf0bce.yy b/views/d31795bd-3e13-4c6b-bec6-ccf6cfdf0bce.yy deleted file mode 100644 index 408dea0f..00000000 --- a/views/d31795bd-3e13-4c6b-bec6-ccf6cfdf0bce.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "d31795bd-3e13-4c6b-bec6-ccf6cfdf0bce", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "d31795bd-3e13-4c6b-bec6-ccf6cfdf0bce", - "children": [ - - ], - "filterType": "GMPath", - "folderName": "paths", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Paths" -} \ No newline at end of file diff --git a/views/df3afc9f-820f-420b-b9b5-ed2c2222c392.yy b/views/df3afc9f-820f-420b-b9b5-ed2c2222c392.yy deleted file mode 100644 index ea1b48f8..00000000 --- a/views/df3afc9f-820f-420b-b9b5-ed2c2222c392.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "df3afc9f-820f-420b-b9b5-ed2c2222c392", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "df3afc9f-820f-420b-b9b5-ed2c2222c392", - "children": [ - - ], - "filterType": "GMExtension", - "folderName": "extensions", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Extensions" -} \ No newline at end of file diff --git a/views/f81a5ff9-7863-41a8-8186-a48a0e804b89.yy b/views/f81a5ff9-7863-41a8-8186-a48a0e804b89.yy deleted file mode 100644 index df821638..00000000 --- a/views/f81a5ff9-7863-41a8-8186-a48a0e804b89.yy +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "f81a5ff9-7863-41a8-8186-a48a0e804b89", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "f81a5ff9-7863-41a8-8186-a48a0e804b89", - "children": [ - "ca6010de-78da-4d2d-a06c-d8021e067eab", - "25021e7e-8142-4fbb-8f3f-aeefd5d03271", - "0bd17290-248f-4321-ab5a-f82c01bc2fbf", - "9ac119d1-18d4-4e8d-b6fe-3a55f9192a0b", - "881dd845-b97a-4dce-a3fe-1ad4ded0084f", - "43355a1d-c927-4976-8b8c-ec643f1db781", - "15c3b5bf-0954-44f0-825f-43431206085c", - "3a73c356-b790-4ff3-9dde-6790b01ef8b2", - "7ed6fdb0-1cb3-4158-9bd0-c37474248cac", - "426a5290-5eb6-446f-be10-7e9300c94750" - ], - "filterType": "GMScript", - "folderName": "Chatterbox", - "isDefaultView": false, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/f86819ac-c627-4fd4-95a4-0e87a325a6ff.yy b/views/f86819ac-c627-4fd4-95a4-0e87a325a6ff.yy deleted file mode 100644 index 0a7e1b0f..00000000 --- a/views/f86819ac-c627-4fd4-95a4-0e87a325a6ff.yy +++ /dev/null @@ -1,14 +0,0 @@ -{ - "id": "f86819ac-c627-4fd4-95a4-0e87a325a6ff", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "f86819ac-c627-4fd4-95a4-0e87a325a6ff", - "children": [ - "f81a5ff9-7863-41a8-8186-a48a0e804b89", - "5035acc2-d809-4bf5-b251-ea72c52874d4" - ], - "filterType": "GMScript", - "folderName": "scripts", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Scripts" -} \ No newline at end of file