diff --git a/GML-toolbox.yyp b/GML-toolbox.yyp index 46a4c0e..cd82d62 100644 --- a/GML-toolbox.yyp +++ b/GML-toolbox.yyp @@ -1,278 +1,68 @@ { - "id": "cf9536ff-a21d-47f8-9988-a5a1a0d72259", - "modelName": "GMProject", - "mvc": "1.0", - "IsDnDProject": false, - "configs": [ - - ], - "option_ecma": false, - "parentProject": { - "id": "a46b533c-10b7-492b-ae4c-3a1437305eb4", - "modelName": "GMProjectParent", - "mvc": "1.0", - "alteredResources": [ - { - "Key": "ed6a955d-5826-4f98-a450-10b414266c27", - "Value": { - "configDeltas": [ - "inherited" - ], - "id": "1945c8d1-2e3f-4a5a-be80-47ecc85973f8", - "resourcePath": "options\\main\\options_main.yy", - "resourceType": "GMMainOptions" - } - } - ], - "hiddenResources": [ - - ], - "projectPath": "${base_project}" - }, - "resources": [ - { - "Key": "051ad556-b780-4746-a2d3-1fd02860cdde", - "Value": { - "id": "efcf9479-cbf2-4bb4-aa24-7e455d8bd3e0", - "resourcePath": "views\\051ad556-b780-4746-a2d3-1fd02860cdde.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "0b5033dd-4be3-4562-bb78-a318ada90a40", - "Value": { - "id": "63940160-7555-4412-87f7-a3812a64acd9", - "resourcePath": "scripts\\instance_count_rect\\instance_count_rect.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "1523ce11-6aa0-4641-99f5-765a3e54628c", - "Value": { - "id": "08351a4e-fe8c-45ab-88f0-27425bf1be2f", - "resourcePath": "views\\1523ce11-6aa0-4641-99f5-765a3e54628c.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "1dd5a658-8b16-49fa-9fb2-98e11caf5064", - "Value": { - "id": "0da2aad5-9862-446d-84fa-d22e136a3069", - "resourcePath": "views\\1dd5a658-8b16-49fa-9fb2-98e11caf5064.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "2347a0cd-d3e1-4068-a4f5-2c348d169974", - "Value": { - "id": "57ae9107-41c1-481b-87e9-4d908ba79efa", - "resourcePath": "scripts\\ds_list_compare\\ds_list_compare.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "2ccf0eb9-78b3-4a9c-ad0d-27d9793c8067", - "Value": { - "id": "fa8e2057-4acd-4abb-9c09-feeb194fa0e0", - "resourcePath": "views\\2ccf0eb9-78b3-4a9c-ad0d-27d9793c8067.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "3b074180-e8c1-4ed4-a7e6-bf06c1263f7a", - "Value": { - "id": "cfd9a2a4-07e8-4869-8b3e-c91ccd13c1a7", - "resourcePath": "views\\3b074180-e8c1-4ed4-a7e6-bf06c1263f7a.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "3b3a881f-9916-4664-88e2-806533cdab61", - "Value": { - "id": "f7b58691-1f7c-4076-be80-bc87dfdc6999", - "resourcePath": "rooms\\room0\\room0.yy", - "resourceType": "GMRoom" - } - }, - { - "Key": "428d2aa5-a954-405f-b50b-3fd06523a089", - "Value": { - "id": "723984f8-ed9d-4554-9e30-6dc305e1a7ed", - "resourcePath": "views\\428d2aa5-a954-405f-b50b-3fd06523a089.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "6007cb46-5ecb-4c73-b988-837140ae9c63", - "Value": { - "id": "806045d1-99e5-49fc-96dc-470a13de9ec0", - "resourcePath": "views\\6007cb46-5ecb-4c73-b988-837140ae9c63.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "60f70857-39ed-4c46-b909-5cc117d40bff", - "Value": { - "id": "81aae38e-3b9e-4468-aca0-e5fd520f8bcf", - "resourcePath": "views\\60f70857-39ed-4c46-b909-5cc117d40bff.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "7c32f5e4-a416-49e9-aa5b-11a78ebb7e4e", - "Value": { - "id": "c425023f-6de3-4c02-8b61-2536fdf621c7", - "resourcePath": "views\\7c32f5e4-a416-49e9-aa5b-11a78ebb7e4e.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "829898a8-9759-434c-9691-8e416d1cad65", - "Value": { - "id": "cf0e2cb6-d6b9-4a84-8d8a-84e998eee25b", - "resourcePath": "views\\829898a8-9759-434c-9691-8e416d1cad65.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "8a7d4756-90ab-4a39-9a31-e875f38b96ad", - "Value": { - "id": "4309808c-4f28-492b-92f4-691baadf1f60", - "resourcePath": "views\\8a7d4756-90ab-4a39-9a31-e875f38b96ad.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "92842606-7ece-468c-a254-47187e4bcec2", - "Value": { - "id": "879e4088-6336-4a7a-972e-6a5ba9078e72", - "resourcePath": "scripts\\instance_count_radius\\instance_count_radius.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "9b4fe599-adc4-4530-be35-17385bd38fbf", - "Value": { - "id": "adf44ff3-fa79-495d-adfa-0575c2d50697", - "resourcePath": "scripts\\round_multiple\\round_multiple.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "9b69ffaf-d2d0-4bb5-b6de-696dc7451bb5", - "Value": { - "id": "54e9c5dc-c7f9-483e-ba30-557fad1bb1aa", - "resourcePath": "views\\9b69ffaf-d2d0-4bb5-b6de-696dc7451bb5.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "a9188620-a624-4a5a-83ae-a1b53faf038b", - "Value": { - "id": "1c24a3f3-845a-4fdf-b1ae-abee8aeb3faa", - "resourcePath": "options\\linux\\options_linux.yy", - "resourceType": "GMLinuxOptions" - } - }, - { - "Key": "b18575d3-66a3-4bd8-a28a-0f23ade20b26", - "Value": { - "id": "ced41661-a4df-42e7-bae1-0cc1b2c5262e", - "resourcePath": "views\\b18575d3-66a3-4bd8-a28a-0f23ade20b26.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "b440b2ef-79b7-48f0-9f11-56ac86c558ee", - "Value": { - "id": "0fae848a-00ce-4c7b-9309-af1221018648", - "resourcePath": "views\\b440b2ef-79b7-48f0-9f11-56ac86c558ee.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "b73189f9-4e39-443a-b8bb-32da44ff9589", - "Value": { - "id": "2ecac1f9-b74b-4559-ac3e-f2045f3a1ceb", - "resourcePath": "views\\b73189f9-4e39-443a-b8bb-32da44ff9589.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "b83040c4-0d0f-4782-9a87-a92aff33c37f", - "Value": { - "id": "d68e6b56-eeb5-4ed9-8b21-28b676fc2720", - "resourcePath": "views\\b83040c4-0d0f-4782-9a87-a92aff33c37f.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "b9378ca3-3492-406d-b13a-8e07b941377e", - "Value": { - "id": "3a0b7990-4f06-44d1-a7da-021375fbb187", - "resourcePath": "views\\b9378ca3-3492-406d-b13a-8e07b941377e.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "cc98d028-7bdd-4680-85f3-c87a7baa481e", - "Value": { - "id": "4315e9a5-7a3b-4fee-824c-dea6dfa56f18", - "resourcePath": "options\\windows\\options_windows.yy", - "resourceType": "GMWindowsOptions" - } - }, - { - "Key": "d969719b-2c39-4a31-8877-1b39371290e0", - "Value": { - "id": "2f2addaf-d6a5-4015-83af-5428ad31d68d", - "resourcePath": "views\\d969719b-2c39-4a31-8877-1b39371290e0.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "da177b65-f0a8-49a6-ba20-be0bac6ca502", - "Value": { - "id": "59ba9c2f-f0b5-4ff4-980d-731dd305260f", - "resourcePath": "scripts\\move_to_tilemap_nearest\\move_to_tilemap_nearest.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "da5c29af-843b-4aea-b305-b7643bd606ea", - "Value": { - "id": "490f5640-6ab7-4cd7-98af-2a943dfe921e", - "resourcePath": "views\\da5c29af-843b-4aea-b305-b7643bd606ea.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "f418569b-3bdd-4706-a0e4-364317f54032", - "Value": { - "id": "b541f578-1b7f-4fab-91e1-dc00bd717b45", - "resourcePath": "options\\mac\\options_mac.yy", - "resourceType": "GMMacOptions" - } - }, - { - "Key": "f9b4f024-cab3-4802-b510-9e334f699025", - "Value": { - "id": "e65bcbe9-52d0-4c1e-a465-7918ef8c535f", - "resourcePath": "views\\f9b4f024-cab3-4802-b510-9e334f699025.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "f9cf6b1b-72fc-47bc-a26f-d0c8412bcd24", - "Value": { - "id": "557eae7b-d3a4-4d08-9c64-8d57c45ab32f", - "resourcePath": "views\\f9cf6b1b-72fc-47bc-a26f-d0c8412bcd24.yy", - "resourceType": "GMFolder" - } - } - ], - "script_order": [ - - ], - "tutorial": "" + "resources": [ + {"id":{"name":"ds_list_compare","path":"scripts/ds_list_compare/ds_list_compare.yy",},"order":0,}, + {"id":{"name":"forEachList","path":"scripts/forEachList/forEachList.yy",},"order":1,}, + {"id":{"name":"forEach","path":"scripts/forEach/forEach.yy",},"order":0,}, + {"id":{"name":"instance_count_radius","path":"scripts/instance_count_radius/instance_count_radius.yy",},"order":0,}, + {"id":{"name":"instance_count_rect","path":"scripts/instance_count_rect/instance_count_rect.yy",},"order":1,}, + {"id":{"name":"customTimer","path":"scripts/customTimer/customTimer.yy",},"order":1,}, + {"id":{"name":"round_multiple","path":"scripts/round_multiple/round_multiple.yy",},"order":0,}, + {"id":{"name":"move_to_tilemap_nearest","path":"scripts/move_to_tilemap_nearest/move_to_tilemap_nearest.yy",},"order":0,}, + {"id":{"name":"logger","path":"scripts/logger/logger.yy",},"order":0,}, + {"id":{"name":"room0","path":"rooms/room0/room0.yy",},"order":0,}, + ], + "Options": [ + {"name":"Linux","path":"options/linux/options_linux.yy",}, + {"name":"Windows","path":"options/windows/options_windows.yy",}, + {"name":"macOS","path":"options/mac/options_mac.yy",}, + {"name":"Main","path":"options/main/options_main.yy",}, + ], + "isDnDProject": false, + "isEcma": false, + "tutorialPath": "", + "configs": { + "name": "Default", + "children": [], + }, + "RoomOrder": [ + {"name":"room0","path":"rooms/room0/room0.yy",}, + ], + "Folders": [ + {"folderPath":"folders/Sprites.yy","order":0,"resourceVersion":"1.0","name":"Sprites","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Tile Sets.yy","order":3,"resourceVersion":"1.0","name":"Tile Sets","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Sounds.yy","order":4,"resourceVersion":"1.0","name":"Sounds","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Paths.yy","order":5,"resourceVersion":"1.0","name":"Paths","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Scripts.yy","order":6,"resourceVersion":"1.0","name":"Scripts","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Scripts/GML-toolbox-sources.yy","order":0,"resourceVersion":"1.0","name":"GML-toolbox-sources","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Scripts/GML-toolbox-sources/functions/ds_list_.yy","order":0,"resourceVersion":"1.0","name":"ds_list_","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Scripts/GML-toolbox-sources/functions/instance_.yy","order":1,"resourceVersion":"1.0","name":"instance_","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Scripts/GML-toolbox-sources/functions/math.yy","order":3,"resourceVersion":"1.0","name":"math","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Scripts/GML-toolbox-sources/functions/move_.yy","order":4,"resourceVersion":"1.0","name":"move_","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Shaders.yy","order":7,"resourceVersion":"1.0","name":"Shaders","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Fonts.yy","order":8,"resourceVersion":"1.0","name":"Fonts","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Timelines.yy","order":9,"resourceVersion":"1.0","name":"Timelines","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Objects.yy","order":10,"resourceVersion":"1.0","name":"Objects","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Rooms.yy","order":11,"resourceVersion":"1.0","name":"Rooms","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Notes.yy","order":12,"resourceVersion":"1.0","name":"Notes","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Extensions.yy","order":13,"resourceVersion":"1.0","name":"Extensions","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Sequences.yy","order":1,"resourceVersion":"1.0","name":"Sequences","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Animation Curves.yy","order":2,"resourceVersion":"1.0","name":"Animation Curves","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Scripts/GML-toolbox-sources/struct-based-modules.yy","order":5,"resourceVersion":"1.0","name":"struct-based-modules","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Scripts/GML-toolbox-sources/functions/iteration.yy","order":2,"resourceVersion":"1.0","name":"iteration","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Scripts/GML-toolbox-sources/functions.yy","order":0,"resourceVersion":"1.0","name":"functions","tags":[],"resourceType":"GMFolder",}, + ], + "AudioGroups": [ + {"targets":461609314234257646,"resourceVersion":"1.0","name":"audiogroup_default","resourceType":"GMAudioGroup",}, + ], + "TextureGroups": [ + {"isScaled":true,"autocrop":true,"border":2,"mipsToGenerate":0,"targets":461609314234257646,"resourceVersion":"1.0","name":"Default","resourceType":"GMTextureGroup",}, + ], + "IncludedFiles": [], + "MetaData": { + "IDEVersion": "2.3.0.529", + }, + "resourceVersion": "1.3", + "name": "GML-toolbox", + "tags": [], + "resourceType": "GMProject", } \ No newline at end of file diff --git a/README.md b/README.md index b6e7247..e7a7d57 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,10 @@ Style guide: Documentation: - -AT LEAST utilize the @funcction, @description, and @param tags + -AT LEAST utilize the @funcction, @description, and @param tags + -For structs, be sure they're documented to some extent + -If a property is intended to be private, be sure to have setters and getters for them, also denote this in the comment + -might use functionless macros for readability later + For any other questions, see existing scripts for examples. diff --git a/options/linux/options_linux.yy b/options/linux/options_linux.yy index 420f04b..6cde620 100644 --- a/options/linux/options_linux.yy +++ b/options/linux/options_linux.yy @@ -1,30 +1,25 @@ { - "id": "a9188620-a624-4a5a-83ae-a1b53faf038b", - "modelName": "GMLinuxOptions", - "mvc": "1.0", - "name": "Linux", - "option_linux_allow_fullscreen": false, - "option_linux_disable_sandbox": 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 c974629..b8904f9 100644 --- a/options/mac/options_mac.yy +++ b/options/mac/options_mac.yy @@ -1,37 +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_apple_sign_in": false, - "option_mac_build_app_store": false, - "option_mac_copyright": "(c) 2018 CompanyName", - "option_mac_disable_sandbox": false, - "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 0000000..1571bd4 --- /dev/null +++ b/options/main/options_main.yy @@ -0,0 +1,16 @@ +{ + "option_gameguid": "ca9cb6de-744d-4313-af0d-70a61e133769", + "option_game_speed": 60, + "option_mips_for_3d_textures": false, + "option_draw_colour": 4294967295, + "option_window_colour": 4278190080, + "option_steam_app_id": "0", + "option_sci_usesci": true, + "option_author": "", + "option_lastchanged": "", + "option_spine_licence": false, + "resourceVersion": "1.2", + "name": "Main", + "tags": [], + "resourceType": "GMMainOptions", +} \ No newline at end of file diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index a9bf9df..15174c3 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": "YoYo Games Ltd", - "option_windows_copy_exe_to_dest": false, - "option_windows_copyright_info": "(c) 2018 CompanyName", - "option_windows_description_info": "A GameMaker Studio 2 Game", - "option_windows_disable_sandbox": false, - "option_windows_display_cursor": true, - "option_windows_display_name": "Made in GameMaker Studio 2", - "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": false, - "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": "Made in GameMaker Studio 2", - "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": true, - "option_windows_texture_page": "2048x2048", - "option_windows_use_splash": false, - "option_windows_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - }, - "option_windows_vsync": false + "option_windows_display_name": "Made in GameMaker Studio 2", + "option_windows_executable_name": "${project_name}", + "option_windows_version": "1.0.0.0", + "option_windows_company_info": "YoYo Games Ltd", + "option_windows_product_info": "Made in GameMaker Studio 2", + "option_windows_copyright_info": "(c) 2018 CompanyName", + "option_windows_description_info": "A GameMaker Studio 2 Game", + "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": false, + "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": true, + "resourceVersion": "1.0", + "name": "Windows", + "tags": [], + "resourceType": "GMWindowsOptions", } \ No newline at end of file diff --git a/rooms/room0/room0.yy b/rooms/room0/room0.yy index 1e577c2..9dff43e 100644 --- a/rooms/room0/room0.yy +++ b/rooms/room0/room0.yy @@ -1,117 +1,52 @@ - { - "name": "room0", - "id": "3b3a881f-9916-4664-88e2-806533cdab61", - "creationCodeFile": "", - "inheritCode": false, - "inheritCreationOrder": false, - "inheritLayers": false, - "instanceCreationOrderIDs": [ - - ], - "IsDnD": false, - "layers": [ - { - "__type": "GMRInstanceLayer_Model:#YoYoStudio.MVCFormat", - "name": "Instances", - "id": "86ba34de-7603-4544-bebd-1a1acbc7054b", - "depth": 0, - "grid_x": 16, - "grid_y": 16, - "hierarchyFrozen": false, - "hierarchyVisible": true, - "inheritLayerDepth": false, - "inheritLayerSettings": false, - "inheritSubLayers": false, - "inheritVisibility": false, - "instances": [ - - ], - "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": "634c36d3-865b-499d-8650-9a5412430596", - "animationFPS": 15, - "animationSpeedType": "0", - "colour": { "Value": 4278190080 }, - "depth": 100, - "grid_x": 16, - "grid_y": 16, - "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": "285d6c53-deae-4e74-ad4f-08fe320f8912", - "inheritPhysicsSettings": false, - "modelName": "GMRoomPhysicsSettings", - "PhysicsWorld": false, - "PhysicsWorldGravityX": 0, - "PhysicsWorldGravityY": 10, - "PhysicsWorldPixToMeters": 0.1, - "mvc": "1.0" - }, - "roomSettings": { - "id": "25a63824-171f-4f61-8d72-c12232ae8235", - "Height": 768, - "inheritRoomSettings": false, - "modelName": "GMRoomSettings", - "persistent": false, - "mvc": "1.0", - "Width": 1024 - }, - "mvc": "1.0", - "views": [ -{"id": "d85f61b1-f4c0-4437-926a-bfab6d6fd352","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": "c96d9635-04ac-4c05-90a5-ebd549d64421","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": "9bc0e2d8-db70-4401-82ad-97bf20e0ac9e","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": "479cb5ec-e54b-4e4b-8484-433519bebe62","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": "c1f05bb2-381e-4a45-85eb-97bfca315292","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": "4f9249cc-5517-496e-a0f7-c11919eb1bc7","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": "a8622bb3-6b40-49e7-8e53-2fb0565fb2af","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": "6722982c-5d88-4206-849d-5f5bf17d0fa5","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": "564c5058-32d0-4d4d-b322-845ad81d2b39", - "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":[],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":16,"gridY":16,"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":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Background","tags":[],"resourceType":"GMRBackgroundLayer",}, + ], + "inheritLayers": false, + "creationCodeFile": "", + "inheritCode": false, + "instanceCreationOrder": [], + "inheritCreationOrder": false, + "sequenceId": null, + "roomSettings": { + "inheritRoomSettings": false, + "Width": 1024, + "Height": 768, + "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": "room0", + "tags": [], + "resourceType": "GMRoom", } \ No newline at end of file diff --git a/script-sources/ds_list_/ds_list_compare.gml b/script-sources/functions/ds_list_/ds_list_compare.gml similarity index 100% rename from script-sources/ds_list_/ds_list_compare.gml rename to script-sources/functions/ds_list_/ds_list_compare.gml diff --git a/script-sources/instance_/instance_count_radius.gml b/script-sources/functions/instance_/instance_count_radius.gml similarity index 100% rename from script-sources/instance_/instance_count_radius.gml rename to script-sources/functions/instance_/instance_count_radius.gml diff --git a/script-sources/instance_/instance_count_rect.gml b/script-sources/functions/instance_/instance_count_rect.gml similarity index 100% rename from script-sources/instance_/instance_count_rect.gml rename to script-sources/functions/instance_/instance_count_rect.gml diff --git a/script-sources/math/round_multiple.gml b/script-sources/functions/math/round_multiple.gml similarity index 100% rename from script-sources/math/round_multiple.gml rename to script-sources/functions/math/round_multiple.gml diff --git a/script-sources/move_/move_to_tilemap_nearest.gml b/script-sources/functions/move_/move_to_tilemap_nearest.gml similarity index 100% rename from script-sources/move_/move_to_tilemap_nearest.gml rename to script-sources/functions/move_/move_to_tilemap_nearest.gml diff --git a/script-sources/struct-based-modules/customTimer.gml b/script-sources/struct-based-modules/customTimer.gml new file mode 100644 index 0000000..7e6c847 --- /dev/null +++ b/script-sources/struct-based-modules/customTimer.gml @@ -0,0 +1,66 @@ +///@function customTimer(callback) +///@description Assign a callback, run the advance function each step, and have a named alarm +///@param ds_list1 +///@param ds_list2 +function customTimer(_callback) constructor { + // PRIVATE: a function to run when timer is activated + callback = _callback; + + // PRIVATE: main counter for time + counter = 0; + + // PRIVATE: goal for counter + toCount = -1; + + // PRIVATE: a quick way to check if timer is active + active = false; + + // return if timer is active or not + function isActive() { + return active; + } + + // set timer and make active + function setTimer(_goalCount) { + toCount = _goalCount; + active = true; + } + + // advance timer and run callback once time is up + function advance() { + if !(toCount == -1) { + // timer is assinged, advance timer + if (counter < toCount) { + counter++; + } else { + // reset counters and run callback + counter = 0; + toCount = -1; + active = false; + callback(); + } + } + } +} + +/* **EXAMPLES** + +// Define in create event: +myTimer = new customTimer(function() { + doThing(); +}); + +// Set timer in step event and advance: +if (conditionIsMet) { + myTimer.setTimer(10); +} +... + +myTimer.advance(); + +// You can also check if a timer is currently active before you use it: +if (!myTimer.isActive()) { + myTimer.setTimer(10); +} + +*/ \ No newline at end of file diff --git a/script-sources/struct-based-modules/logger.gml b/script-sources/struct-based-modules/logger.gml new file mode 100644 index 0000000..e5ded91 --- /dev/null +++ b/script-sources/struct-based-modules/logger.gml @@ -0,0 +1,96 @@ +function logger(_logFileName, _fileIsUnique) constructor { + + // PRIVATE: assign a filename and create file + fileName = (_fileIsUnique ? _logFileName + "_" + string_replace(string(date_current_datetime()) + "_", ".", "_") + string(current_second) : _logFileName) + ".txt"; + + // PRIVATE: log file index + logFile = file_text_open_append(fileName); + + + // PRIVATE: sends texts to log file and prints to console if needed + function log(_textToLog, _logToConsole) { + file_text_write_string(logFile, _textToLog + "\n"); + if _logToConsole { + show_debug_message(_textToLog); + } + } + + // logs to "debug" level + function debug(_textToLog, _logToConsole) { + text = "DEBUG: \t" + string(_textToLog); + log(text, _logToConsole); + } + + // logs to "info" level + function info(_textToLog, _logToConsole) { + text = "INFO: \t" + string(_textToLog); + log(text, _logToConsole); + } + + // logs to "warn" level + function warn(_textToLog, _logToConsole) { + text = "WARN: \t" + string(_textToLog); + log(text, _logToConsole); + } + + // logs to "error" level + function error(_textToLog, _logToConsole) { + text = "ERROR: \t" + string(_textToLog); + log(text, _logToConsole); + } + + // logs to "fatal" level + function fatal(_textToLog, _logToConsole) { + text = "FATAL: \t" + string(_textToLog); + log(text, _logToConsole); + } + + + // return name of log file + function getFileName() { + return fileName; + } + + // closes file, saving it to drive at given location + function closeAndPublish() { + file_text_close(logFile); + } + + // close and reopen log file + function publish() { + closeAndPublish(); + logFile = logFile = file_text_open_append(fileName); + } +} + +/* **EXAMPLE** + +// Define logger in either object create event or struct constructor: +myLogger = new logger("mylog", false); // will save as "mylog.txt" +myLogger = new logger("mylog", true); // will save as "mylog_[TIMEDATE]_[INGAMEMILLISECOND].txt" + +// Call logger whenever needed to append information to file and/or log to the console +if (conditionIsMet) { + myLogger.info("Important information!"); + // will log "INFO: Important information!" +} + +... + +try { + // risky thing... +} catch(ex) { + myLogger.fatal( string(ex) ); + // will log "FATAL: [Runtime exception struct]" + myLogger.closeAndPublish(); // <-- will get to this in a sec +} + +// Whenever you want to be sure the log file is saved, publish to the file: +... other logging funny business +myLogger.publish(); + +// Whenever you're finished logging, you'll want to be sure all logging info is saved. So close and publish: +... +myLogger.closeAndPublish(); // will to file and close + +*/ \ No newline at end of file diff --git a/scripts/customTimer/customTimer.gml b/scripts/customTimer/customTimer.gml new file mode 100644 index 0000000..b010d2e --- /dev/null +++ b/scripts/customTimer/customTimer.gml @@ -0,0 +1,66 @@ +///@function customTimer(callback) +///@description Assign a callback, run the advance function each step, and have a named alarm +///@param ds_list1 +///@param ds_list2 +function customTimer(_callback) constructor { + // @private a function to run when timer is activated + callback = _callback; + + // @private; main counter for time + counter = 0; + + // @private; goal for counter + toCount = -1; + + // @private; a quick way to check if timer is active + active = false; + + // return if timer is active or not + function isActive() { + return active; + } + + // set timer and make active + function setTimer(_goalCount) { + toCount = _goalCount; + active = true; + } + + // advance timer and run callback once time is up + function advance() { + if !(toCount == -1) { + // timer is assinged, advance timer + if (counter < toCount) { + counter++; + } else { + // reset counters and run callback + counter = 0; + toCount = -1; + active = false; + callback(); + } + } + } +} + +/* **EXAMPLES** + +// Define in create event: +myTimer = new customTimer(function() { + doThing(); +}); + +// Set timer in step event and advance: +if (conditionIsMet) { + myTimer.setTimer(10); +} +... + +myTimer.advance(); + +// You can also check if a timer is currently active before you use it: +if (!myTimer.isActive()) { + myTimer.setTimer(10); +} + +*/ \ No newline at end of file diff --git a/scripts/customTimer/customTimer.yy b/scripts/customTimer/customTimer.yy new file mode 100644 index 0000000..a9b8cc9 --- /dev/null +++ b/scripts/customTimer/customTimer.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "struct-based-modules", + "path": "folders/Scripts/GML-toolbox-sources/struct-based-modules.yy", + }, + "resourceVersion": "1.0", + "name": "customTimer", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/ds_list_compare/ds_list_compare.gml b/scripts/ds_list_compare/ds_list_compare.gml index 4585923..436fa3f 100644 --- a/scripts/ds_list_compare/ds_list_compare.gml +++ b/scripts/ds_list_compare/ds_list_compare.gml @@ -2,24 +2,28 @@ ///@description Compares two ds lists to see if they are identical ///@param ds_list1 ///@param ds_list2 +function ds_list_compare(_ds_list1, _ds_list2) { -var ds_list1 = argument0; -var ds_list2 = argument1; -var list1_size = ds_list_size(ds_list1); -var list2_size = ds_list_size(ds_list2); + ds_list1 = _ds_list1; + ds_list2 = _ds_list2; + list1_size = ds_list_size(ds_list1); + list2_size = ds_list_size(ds_list2); -var returnValue= true; + returnValue= true; -if list1_size == list2_size { // checks if lists are equal in size - for(var i=0; i0{ - x=xx + lengthdir_x(sprite_width/2+2, j*angle_interval); - y=yy + lengthdir_y(sprite_height/2+2, j*angle_interval); - quit=true; - break; + var map_id = layer_tilemap_get_id(layer_get_id(layer_name)) + if tilemap_get_at_pixel(map_id, xx, yy) > 0 { + other.x = xx + lengthdir_x(sprite_width / 2 + 2, j * angle_interval); + other.y = yy + lengthdir_y(sprite_height / 2 + 2, j * angle_interval); + quit = true; + break; + } } + if quit + break; } - if quit - break; -} \ No newline at end of file + + +} diff --git a/scripts/move_to_tilemap_nearest/move_to_tilemap_nearest.yy b/scripts/move_to_tilemap_nearest/move_to_tilemap_nearest.yy index 2b6b482..a094048 100644 --- a/scripts/move_to_tilemap_nearest/move_to_tilemap_nearest.yy +++ b/scripts/move_to_tilemap_nearest/move_to_tilemap_nearest.yy @@ -1,8 +1,12 @@ { - "id": "da177b65-f0a8-49a6-ba20-be0bac6ca502", - "modelName": "GMScript", - "mvc": "1.0", - "name": "move_to_tilemap_nearest", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "move_", + "path": "folders/Scripts/GML-toolbox-sources/functions/move_.yy", + }, + "resourceVersion": "1.0", + "name": "move_to_tilemap_nearest", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/round_multiple/round_multiple.gml b/scripts/round_multiple/round_multiple.gml index bd2e5ce..8a9a88d 100644 --- a/scripts/round_multiple/round_multiple.gml +++ b/scripts/round_multiple/round_multiple.gml @@ -2,26 +2,31 @@ ///@description Rounds given number to nearest given multiple. ///@param number_round ///@param multiple_round +function round_multiple(_number_round, _multiple_round) { -var number = round(argument0); -var multipleOf = argument1; -var i=1; -var retNumber = number; + number = round(_number_round); + multipleOf = _multiple_round; + i=1; + retNumber = number; -// iterates until npi or nmi are 0, or i is greater/equal to multipleOf -while (i < multipleOf) { - var npi = (number+i) mod multipleOf; - var nmi = (number-i) mod multipleOf; + // iterates until npi or nmi are 0, or i is greater/equal to multipleOf + while (i < multipleOf) { + var npi = (number+i) mod multipleOf; + var nmi = (number-i) mod multipleOf; - if npi == 0 { - retNumber = number + i; - break; + if npi == 0 { + retNumber = number + i; + break; + } + if nmi == 0{ + retNumber = number - i; + break; + } + i++; } - if nmi == 0{ - retNumber = number - i; - break; - } - i++; -} -return retNumber; + return retNumber; + + + +} diff --git a/scripts/round_multiple/round_multiple.yy b/scripts/round_multiple/round_multiple.yy index 389a56b..ead23a0 100644 --- a/scripts/round_multiple/round_multiple.yy +++ b/scripts/round_multiple/round_multiple.yy @@ -1,8 +1,12 @@ { - "id": "9b4fe599-adc4-4530-be35-17385bd38fbf", - "modelName": "GMScript", - "mvc": "1.0", - "name": "round_multiple", - "IsCompatibility": false, - "IsDnD": false + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "math", + "path": "folders/Scripts/GML-toolbox-sources/functions/math.yy", + }, + "resourceVersion": "1.0", + "name": "round_multiple", + "tags": [], + "resourceType": "GMScript", } \ No newline at end of file diff --git a/views/051ad556-b780-4746-a2d3-1fd02860cdde.yy b/views/051ad556-b780-4746-a2d3-1fd02860cdde.yy deleted file mode 100644 index ef060ac..0000000 --- a/views/051ad556-b780-4746-a2d3-1fd02860cdde.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "051ad556-b780-4746-a2d3-1fd02860cdde", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "051ad556-b780-4746-a2d3-1fd02860cdde", - "children": [ - "da177b65-f0a8-49a6-ba20-be0bac6ca502" - ], - "filterType": "GMScript", - "folderName": "move_", - "isDefaultView": false, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/1523ce11-6aa0-4641-99f5-765a3e54628c.yy b/views/1523ce11-6aa0-4641-99f5-765a3e54628c.yy deleted file mode 100644 index 0a95157..0000000 --- a/views/1523ce11-6aa0-4641-99f5-765a3e54628c.yy +++ /dev/null @@ -1,27 +0,0 @@ -{ - "id": "1523ce11-6aa0-4641-99f5-765a3e54628c", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "1523ce11-6aa0-4641-99f5-765a3e54628c", - "children": [ - "f9cf6b1b-72fc-47bc-a26f-d0c8412bcd24", - "f9b4f024-cab3-4802-b510-9e334f699025", - "829898a8-9759-434c-9691-8e416d1cad65", - "8a7d4756-90ab-4a39-9a31-e875f38b96ad", - "d969719b-2c39-4a31-8877-1b39371290e0", - "b18575d3-66a3-4bd8-a28a-0f23ade20b26", - "da5c29af-843b-4aea-b305-b7643bd606ea", - "2ccf0eb9-78b3-4a9c-ad0d-27d9793c8067", - "1dd5a658-8b16-49fa-9fb2-98e11caf5064", - "9b69ffaf-d2d0-4bb5-b6de-696dc7451bb5", - "b73189f9-4e39-443a-b8bb-32da44ff9589", - "6007cb46-5ecb-4c73-b988-837140ae9c63", - "7c32f5e4-a416-49e9-aa5b-11a78ebb7e4e", - "b9378ca3-3492-406d-b13a-8e07b941377e", - "b83040c4-0d0f-4782-9a87-a92aff33c37f" - ], - "filterType": "root", - "folderName": "Default", - "isDefaultView": true, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/1dd5a658-8b16-49fa-9fb2-98e11caf5064.yy b/views/1dd5a658-8b16-49fa-9fb2-98e11caf5064.yy deleted file mode 100644 index ca7ba85..0000000 --- a/views/1dd5a658-8b16-49fa-9fb2-98e11caf5064.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "1dd5a658-8b16-49fa-9fb2-98e11caf5064", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "1dd5a658-8b16-49fa-9fb2-98e11caf5064", - "children": [ - - ], - "filterType": "GMObject", - "folderName": "objects", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Objects" -} \ No newline at end of file diff --git a/views/2ccf0eb9-78b3-4a9c-ad0d-27d9793c8067.yy b/views/2ccf0eb9-78b3-4a9c-ad0d-27d9793c8067.yy deleted file mode 100644 index b130afc..0000000 --- a/views/2ccf0eb9-78b3-4a9c-ad0d-27d9793c8067.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "2ccf0eb9-78b3-4a9c-ad0d-27d9793c8067", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "2ccf0eb9-78b3-4a9c-ad0d-27d9793c8067", - "children": [ - - ], - "filterType": "GMTimeline", - "folderName": "timelines", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Timelines" -} \ No newline at end of file diff --git a/views/3b074180-e8c1-4ed4-a7e6-bf06c1263f7a.yy b/views/3b074180-e8c1-4ed4-a7e6-bf06c1263f7a.yy deleted file mode 100644 index b24b9e5..0000000 --- a/views/3b074180-e8c1-4ed4-a7e6-bf06c1263f7a.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "3b074180-e8c1-4ed4-a7e6-bf06c1263f7a", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "3b074180-e8c1-4ed4-a7e6-bf06c1263f7a", - "children": [ - "2347a0cd-d3e1-4068-a4f5-2c348d169974" - ], - "filterType": "GMScript", - "folderName": "ds_list_", - "isDefaultView": false, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/428d2aa5-a954-405f-b50b-3fd06523a089.yy b/views/428d2aa5-a954-405f-b50b-3fd06523a089.yy deleted file mode 100644 index 9474bc4..0000000 --- a/views/428d2aa5-a954-405f-b50b-3fd06523a089.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "428d2aa5-a954-405f-b50b-3fd06523a089", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "428d2aa5-a954-405f-b50b-3fd06523a089", - "children": [ - "9b4fe599-adc4-4530-be35-17385bd38fbf" - ], - "filterType": "GMScript", - "folderName": "math", - "isDefaultView": false, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/6007cb46-5ecb-4c73-b988-837140ae9c63.yy b/views/6007cb46-5ecb-4c73-b988-837140ae9c63.yy deleted file mode 100644 index 3e69b7d..0000000 --- a/views/6007cb46-5ecb-4c73-b988-837140ae9c63.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "6007cb46-5ecb-4c73-b988-837140ae9c63", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "6007cb46-5ecb-4c73-b988-837140ae9c63", - "children": [ - - ], - "filterType": "GMIncludedFile", - "folderName": "datafiles", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_IncludedFiles" -} \ No newline at end of file diff --git a/views/60f70857-39ed-4c46-b909-5cc117d40bff.yy b/views/60f70857-39ed-4c46-b909-5cc117d40bff.yy deleted file mode 100644 index 1c209e1..0000000 --- a/views/60f70857-39ed-4c46-b909-5cc117d40bff.yy +++ /dev/null @@ -1,14 +0,0 @@ -{ - "id": "60f70857-39ed-4c46-b909-5cc117d40bff", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "60f70857-39ed-4c46-b909-5cc117d40bff", - "children": [ - "92842606-7ece-468c-a254-47187e4bcec2", - "0b5033dd-4be3-4562-bb78-a318ada90a40" - ], - "filterType": "GMScript", - "folderName": "instance_", - "isDefaultView": false, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/7c32f5e4-a416-49e9-aa5b-11a78ebb7e4e.yy b/views/7c32f5e4-a416-49e9-aa5b-11a78ebb7e4e.yy deleted file mode 100644 index 77a0067..0000000 --- a/views/7c32f5e4-a416-49e9-aa5b-11a78ebb7e4e.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "7c32f5e4-a416-49e9-aa5b-11a78ebb7e4e", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "7c32f5e4-a416-49e9-aa5b-11a78ebb7e4e", - "children": [ - - ], - "filterType": "GMExtension", - "folderName": "extensions", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Extensions" -} \ No newline at end of file diff --git a/views/829898a8-9759-434c-9691-8e416d1cad65.yy b/views/829898a8-9759-434c-9691-8e416d1cad65.yy deleted file mode 100644 index 8a0a45c..0000000 --- a/views/829898a8-9759-434c-9691-8e416d1cad65.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "829898a8-9759-434c-9691-8e416d1cad65", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "829898a8-9759-434c-9691-8e416d1cad65", - "children": [ - - ], - "filterType": "GMSound", - "folderName": "sounds", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Sounds" -} \ No newline at end of file diff --git a/views/8a7d4756-90ab-4a39-9a31-e875f38b96ad.yy b/views/8a7d4756-90ab-4a39-9a31-e875f38b96ad.yy deleted file mode 100644 index 381b24d..0000000 --- a/views/8a7d4756-90ab-4a39-9a31-e875f38b96ad.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "8a7d4756-90ab-4a39-9a31-e875f38b96ad", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "8a7d4756-90ab-4a39-9a31-e875f38b96ad", - "children": [ - - ], - "filterType": "GMPath", - "folderName": "paths", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Paths" -} \ No newline at end of file diff --git a/views/9b69ffaf-d2d0-4bb5-b6de-696dc7451bb5.yy b/views/9b69ffaf-d2d0-4bb5-b6de-696dc7451bb5.yy deleted file mode 100644 index 2818e48..0000000 --- a/views/9b69ffaf-d2d0-4bb5-b6de-696dc7451bb5.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "9b69ffaf-d2d0-4bb5-b6de-696dc7451bb5", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "9b69ffaf-d2d0-4bb5-b6de-696dc7451bb5", - "children": [ - "3b3a881f-9916-4664-88e2-806533cdab61" - ], - "filterType": "GMRoom", - "folderName": "rooms", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Rooms" -} \ No newline at end of file diff --git a/views/b18575d3-66a3-4bd8-a28a-0f23ade20b26.yy b/views/b18575d3-66a3-4bd8-a28a-0f23ade20b26.yy deleted file mode 100644 index 21080f9..0000000 --- a/views/b18575d3-66a3-4bd8-a28a-0f23ade20b26.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "b18575d3-66a3-4bd8-a28a-0f23ade20b26", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "b18575d3-66a3-4bd8-a28a-0f23ade20b26", - "children": [ - - ], - "filterType": "GMShader", - "folderName": "shaders", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Shaders" -} \ No newline at end of file diff --git a/views/b440b2ef-79b7-48f0-9f11-56ac86c558ee.yy b/views/b440b2ef-79b7-48f0-9f11-56ac86c558ee.yy deleted file mode 100644 index b8ae7a1..0000000 --- a/views/b440b2ef-79b7-48f0-9f11-56ac86c558ee.yy +++ /dev/null @@ -1,16 +0,0 @@ -{ - "id": "b440b2ef-79b7-48f0-9f11-56ac86c558ee", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "b440b2ef-79b7-48f0-9f11-56ac86c558ee", - "children": [ - "3b074180-e8c1-4ed4-a7e6-bf06c1263f7a", - "60f70857-39ed-4c46-b909-5cc117d40bff", - "428d2aa5-a954-405f-b50b-3fd06523a089", - "051ad556-b780-4746-a2d3-1fd02860cdde" - ], - "filterType": "GMScript", - "folderName": "GML-toolbox-sources", - "isDefaultView": false, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/b73189f9-4e39-443a-b8bb-32da44ff9589.yy b/views/b73189f9-4e39-443a-b8bb-32da44ff9589.yy deleted file mode 100644 index 97a5bda..0000000 --- a/views/b73189f9-4e39-443a-b8bb-32da44ff9589.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "b73189f9-4e39-443a-b8bb-32da44ff9589", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "b73189f9-4e39-443a-b8bb-32da44ff9589", - "children": [ - - ], - "filterType": "GMNotes", - "folderName": "notes", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Notes" -} \ No newline at end of file diff --git a/views/b83040c4-0d0f-4782-9a87-a92aff33c37f.yy b/views/b83040c4-0d0f-4782-9a87-a92aff33c37f.yy deleted file mode 100644 index b91bd79..0000000 --- a/views/b83040c4-0d0f-4782-9a87-a92aff33c37f.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "b83040c4-0d0f-4782-9a87-a92aff33c37f", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "b83040c4-0d0f-4782-9a87-a92aff33c37f", - "children": [ - - ], - "filterType": "GMConfig", - "folderName": "configs", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Configs" -} \ No newline at end of file diff --git a/views/b9378ca3-3492-406d-b13a-8e07b941377e.yy b/views/b9378ca3-3492-406d-b13a-8e07b941377e.yy deleted file mode 100644 index 425d18e..0000000 --- a/views/b9378ca3-3492-406d-b13a-8e07b941377e.yy +++ /dev/null @@ -1,16 +0,0 @@ -{ - "id": "b9378ca3-3492-406d-b13a-8e07b941377e", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "b9378ca3-3492-406d-b13a-8e07b941377e", - "children": [ - "ed6a955d-5826-4f98-a450-10b414266c27", - "f418569b-3bdd-4706-a0e4-364317f54032", - "cc98d028-7bdd-4680-85f3-c87a7baa481e", - "a9188620-a624-4a5a-83ae-a1b53faf038b" - ], - "filterType": "GMOptions", - "folderName": "options", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Options" -} \ No newline at end of file diff --git a/views/d969719b-2c39-4a31-8877-1b39371290e0.yy b/views/d969719b-2c39-4a31-8877-1b39371290e0.yy deleted file mode 100644 index 0ee1e21..0000000 --- a/views/d969719b-2c39-4a31-8877-1b39371290e0.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "d969719b-2c39-4a31-8877-1b39371290e0", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "d969719b-2c39-4a31-8877-1b39371290e0", - "children": [ - "b440b2ef-79b7-48f0-9f11-56ac86c558ee" - ], - "filterType": "GMScript", - "folderName": "scripts", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Scripts" -} \ No newline at end of file diff --git a/views/da5c29af-843b-4aea-b305-b7643bd606ea.yy b/views/da5c29af-843b-4aea-b305-b7643bd606ea.yy deleted file mode 100644 index 3e07f2a..0000000 --- a/views/da5c29af-843b-4aea-b305-b7643bd606ea.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "da5c29af-843b-4aea-b305-b7643bd606ea", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "da5c29af-843b-4aea-b305-b7643bd606ea", - "children": [ - - ], - "filterType": "GMFont", - "folderName": "fonts", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Fonts" -} \ No newline at end of file diff --git a/views/f9b4f024-cab3-4802-b510-9e334f699025.yy b/views/f9b4f024-cab3-4802-b510-9e334f699025.yy deleted file mode 100644 index 215a5b5..0000000 --- a/views/f9b4f024-cab3-4802-b510-9e334f699025.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "f9b4f024-cab3-4802-b510-9e334f699025", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "f9b4f024-cab3-4802-b510-9e334f699025", - "children": [ - - ], - "filterType": "GMTileSet", - "folderName": "tilesets", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Tilesets" -} \ No newline at end of file diff --git a/views/f9cf6b1b-72fc-47bc-a26f-d0c8412bcd24.yy b/views/f9cf6b1b-72fc-47bc-a26f-d0c8412bcd24.yy deleted file mode 100644 index c85a3e1..0000000 --- a/views/f9cf6b1b-72fc-47bc-a26f-d0c8412bcd24.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "f9cf6b1b-72fc-47bc-a26f-d0c8412bcd24", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "f9cf6b1b-72fc-47bc-a26f-d0c8412bcd24", - "children": [ - - ], - "filterType": "GMSprite", - "folderName": "sprites", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Sprites" -} \ No newline at end of file