chaos, added collision boxes

katsaii · Jul 2, 2023 · 1422f3f · 1422f3f
1 parent 0cd838e
commit 1422f3f
Show file tree

Hide file tree

Showing 13 changed files with 408 additions and 230 deletions.
diff --git a/datafiles/.gitignore b/datafiles/.gitignore
@@ -0,0 +1,2 @@
+level1boss*
+readyboss*
diff --git a/disarm.resource_order b/disarm.resource_order
@@ -0,0 +1,7 @@
+{
+  "FolderOrderSettings": [],
+  "ResourceOrderSettings": [
+    {"name":"scr_disarm","order":1,"path":"scripts/scr_disarm/scr_disarm.yy",},
+    {"name":"rm_test","order":11,"path":"rooms/rm_test/rm_test.yy",},
+  ],
+}
diff --git a/disarm.yyp b/disarm.yyp
@@ -1,48 +1,46 @@
 {
-  "resources": [
-    {"id":{"name":"obj_disarm_example","path":"objects/obj_disarm_example/obj_disarm_example.yy",},"order":0,},
-    {"id":{"name":"scr_disarm","path":"scripts/scr_disarm/scr_disarm.yy",},"order":1,},
-    {"id":{"name":"rm_test","path":"rooms/rm_test/rm_test.yy",},"order":11,},
-  ],
-  "Options": [
-    {"name":"Linux","path":"options/linux/options_linux.yy",},
-    {"name":"macOS","path":"options/mac/options_mac.yy",},
-    {"name":"Main","path":"options/main/options_main.yy",},
-    {"name":"Windows","path":"options/windows/options_windows.yy",},
-    {"name":"HTML5","path":"options/html5/options_html5.yy",},
-    {"name":"operagx","path":"options/operagx/options_operagx.yy",},
+  "resourceType": "GMProject",
+  "resourceVersion": "1.7",
+  "name": "disarm",
+  "AudioGroups": [
+    {"resourceType":"GMAudioGroup","resourceVersion":"1.3","name":"audiogroup_default","targets":-1,},
   ],
-  "defaultScriptType": 1,
-  "isEcma": false,
   "configs": {
-    "name": "Default",
     "children": [],
+    "name": "Default",
   },
-  "RoomOrderNodes": [
-    {"roomId":{"name":"rm_test","path":"rooms/rm_test/rm_test.yy",},},
-  ],
+  "defaultScriptType": 1,
   "Folders": [
-    {"folderPath":"folders/Disarm.yy","order":10,"resourceVersion":"1.0","name":"Disarm","tags":[],"resourceType":"GMFolder",},
-  ],
-  "AudioGroups": [
-    {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",},
-  ],
-  "TextureGroups": [
-    {"isScaled":true,"compressFormat":"bz2","autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",},
+    {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Disarm","folderPath":"folders/Disarm.yy",},
   ],
   "IncludedFiles": [
-    {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"armature.scon","resourceType":"GMIncludedFile",},
-    {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"armature.json","resourceType":"GMIncludedFile",},
-    {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"armature.png","resourceType":"GMIncludedFile",},
-    {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"wanda.json","resourceType":"GMIncludedFile",},
-    {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"wanda.png","resourceType":"GMIncludedFile",},
-    {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"wanda.scon","resourceType":"GMIncludedFile",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"armature.json","CopyToMask":-1,"filePath":"datafiles",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"armature.png","CopyToMask":-1,"filePath":"datafiles",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"armature.scon","CopyToMask":-1,"filePath":"datafiles",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"level1boss.json","CopyToMask":-1,"filePath":"datafiles",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"level1boss.png","CopyToMask":-1,"filePath":"datafiles",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"level1boss.scon","CopyToMask":-1,"filePath":"datafiles",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"readyboss.json","CopyToMask":-1,"filePath":"datafiles",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"readyboss.png","CopyToMask":-1,"filePath":"datafiles",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"readyboss.scon","CopyToMask":-1,"filePath":"datafiles",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"wanda.json","CopyToMask":-1,"filePath":"datafiles",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"wanda.png","CopyToMask":-1,"filePath":"datafiles",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"wanda.scon","CopyToMask":-1,"filePath":"datafiles",},
   ],
+  "isEcma": false,
+  "LibraryEmitters": [],
   "MetaData": {
-    "IDEVersion": "2022.6.1.26",
+    "IDEVersion": "2023.4.0.84",
   },
-  "resourceVersion": "1.5",
-  "name": "disarm",
-  "tags": [],
-  "resourceType": "GMProject",
+  "resources": [
+    {"id":{"name":"obj_disarm_example","path":"objects/obj_disarm_example/obj_disarm_example.yy",},},
+    {"id":{"name":"scr_disarm","path":"scripts/scr_disarm/scr_disarm.yy",},},
+    {"id":{"name":"rm_test","path":"rooms/rm_test/rm_test.yy",},},
+  ],
+  "RoomOrderNodes": [
+    {"roomId":{"name":"rm_test","path":"rooms/rm_test/rm_test.yy",},},
+  ],
+  "TextureGroups": [
+    {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","directory":"","groupParent":null,"isScaled":true,"loadType":"default","mipsToGenerate":0,"targets":-1,},
+  ],
 }
diff --git a/objects/obj_disarm_example/obj_disarm_example.yy b/objects/obj_disarm_example/obj_disarm_example.yy
@@ -1,38 +1,37 @@
 {
-  "spriteId": null,
-  "solid": false,
-  "visible": true,
-  "managed": true,
-  "spriteMaskId": null,
-  "persistent": false,
-  "parentObjectId": null,
-  "physicsObject": false,
-  "physicsSensor": false,
-  "physicsShape": 1,
-  "physicsGroup": 1,
-  "physicsDensity": 0.5,
-  "physicsRestitution": 0.1,
-  "physicsLinearDamping": 0.1,
-  "physicsAngularDamping": 0.1,
-  "physicsFriction": 0.2,
-  "physicsStartAwake": true,
-  "physicsKinematic": false,
-  "physicsShapePoints": [],
+  "resourceType": "GMObject",
+  "resourceVersion": "1.0",
+  "name": "obj_disarm_example",
   "eventList": [
-    {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
-    {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
-    {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
-    {"isDnD":false,"eventNum":1,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
-    {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
+    {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,},
+    {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,},
+    {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,},
+    {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":1,"eventType":3,"isDnD":false,},
+    {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,},
   ],
-  "properties": [],
+  "managed": true,
   "overriddenProperties": [],
   "parent": {
     "name": "Disarm",
     "path": "folders/Disarm.yy",
   },
-  "resourceVersion": "1.0",
-  "name": "obj_disarm_example",
-  "tags": [],
-  "resourceType": "GMObject",
+  "parentObjectId": null,
+  "persistent": false,
+  "physicsAngularDamping": 0.1,
+  "physicsDensity": 0.5,
+  "physicsFriction": 0.2,
+  "physicsGroup": 1,
+  "physicsKinematic": false,
+  "physicsLinearDamping": 0.1,
+  "physicsObject": false,
+  "physicsRestitution": 0.1,
+  "physicsSensor": false,
+  "physicsShape": 1,
+  "physicsShapePoints": [],
+  "physicsStartAwake": true,
+  "properties": [],
+  "solid": false,
+  "spriteId": null,
+  "spriteMaskId": null,
+  "visible": true,
 }
diff --git a/options/html5/options_html5.yy b/options/html5/options_html5.yy
@@ -1,34 +1,33 @@
 {
-  "option_html5_browser_title": "Created with 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": "use_default",
-  "option_html5_loadingbar": "Use Default",
-  "option_html5_jsprepend": "",
-  "option_html5_icon": "${base_options_dir}/html5/fav.ico",
+  "resourceType": "GMHtml5Options",
+  "resourceVersion": "1.0",
+  "name": "HTML5",
   "option_html5_allow_fullscreen": true,
-  "option_html5_interpolate_pixels": true,
+  "option_html5_browser_title": "Created with GameMaker Studio 2",
   "option_html5_centregame": true,
-  "option_html5_usebuiltinparticles": true,
-  "option_html5_usebuiltinfont": true,
-  "option_html5_webgl": 2,
-  "option_html5_scale": 0,
-  "option_html5_texture_page": "2048x2048",
-  "option_html5_use_facebook": false,
-  "option_html5_facebook_id": "",
+  "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": "",
-  "resourceVersion": "1.0",
-  "name": "HTML5",
-  "tags": [],
-  "resourceType": "GMHtml5Options",
+  "option_html5_icon": "${base_options_dir}/html5/fav.ico",
+  "option_html5_index": "use_default",
+  "option_html5_interpolate_pixels": true,
+  "option_html5_jsprepend": "",
+  "option_html5_loadingbar": "Use Default",
+  "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_usebuiltinfont": true,
+  "option_html5_usebuiltinparticles": true,
+  "option_html5_usesplash": false,
+  "option_html5_version": "1.0.0.0",
+  "option_html5_webgl": 2,
 }
diff --git a/options/linux/options_linux.yy b/options/linux/options_linux.yy
@@ -1,25 +1,24 @@
 {
+  "resourceType": "GMLinuxOptions",
+  "resourceVersion": "1.0",
+  "name": "Linux",
+  "option_linux_allow_fullscreen": false,
+  "option_linux_disable_sandbox": false,
+  "option_linux_display_cursor": true,
   "option_linux_display_name": "Created with 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_enable_steam": false,
+  "option_linux_homepage": "http://www.yoyogames.com",
   "option_linux_icon": "${base_options_dir}/linux/icons/64.png",
-  "option_linux_start_fullscreen": false,
-  "option_linux_allow_fullscreen": false,
   "option_linux_interpolate_pixels": true,
-  "option_linux_display_cursor": true,
-  "option_linux_sync": 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_enable_steam": false,
-  "option_linux_disable_sandbox": false,
-  "resourceVersion": "1.0",
-  "name": "Linux",
-  "tags": [],
-  "resourceType": "GMLinuxOptions",
+  "option_linux_version": "1.0.0.0",
 }
diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy
@@ -1,33 +1,35 @@
 {
-  "option_mac_display_name": "Created with GameMaker Studio 2",
+  "resourceType": "GMMacOptions",
+  "resourceVersion": "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_version": "1.0.0.0",
-  "option_mac_output_dir": "~/gamemakerstudio2",
-  "option_mac_team_id": "",
-  "option_mac_signing_identity": "Developer ID Application:",
+  "option_mac_apple_sign_in": false,
+  "option_mac_arm64": true,
+  "option_mac_build_app_store": false,
   "option_mac_copyright": "",
-  "option_mac_splash_png": "${base_options_dir}/mac/splash/splash.png",
+  "option_mac_disable_sandbox": false,
+  "option_mac_display_cursor": true,
+  "option_mac_display_name": "Created with 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_installer_background_png": "${base_options_dir}/mac/splash/installer_background.png",
-  "option_mac_menu_dock": false,
-  "option_mac_display_cursor": true,
-  "option_mac_start_fullscreen": false,
-  "option_mac_allow_fullscreen": false,
   "option_mac_interpolate_pixels": true,
-  "option_mac_vsync": false,
+  "option_mac_menu_dock": false,
+  "option_mac_min_version": "10.10",
+  "option_mac_output_dir": "~/gamemakerstudio2",
   "option_mac_resize_window": false,
-  "option_mac_enable_retina": 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": "",
   "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",
+  "option_mac_version": "1.0.0.0",
+  "option_mac_vsync": false,
+  "option_mac_x86_64": true,
 }
diff --git a/options/main/options_main.yy b/options/main/options_main.yy
@@ -1,21 +1,20 @@
 {
+  "resourceType": "GMMainOptions",
+  "resourceVersion": "1.4",
+  "name": "Main",
+  "option_author": "",
+  "option_collision_compatibility": true,
+  "option_copy_on_write_enabled": true,
+  "option_draw_colour": 4294967295,
+  "option_game_speed": 60,
   "option_gameguid": "b19506d5-53a7-4405-966e-4fbe5e8a494c",
   "option_gameid": "0",
-  "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_collision_compatibility": true,
-  "option_copy_on_write_enabled": true,
   "option_spine_licence": false,
-  "option_template_image": "${base_options_dir}/main/template_image.png",
-  "option_template_icon": "${base_options_dir}/main/template_icon.png",
+  "option_steam_app_id": "0",
   "option_template_description": null,
-  "resourceVersion": "1.4",
-  "name": "Main",
-  "tags": [],
-  "resourceType": "GMMainOptions",
+  "option_template_icon": "${base_options_dir}/main/template_icon.png",
+  "option_template_image": "${base_options_dir}/main/template_image.png",
+  "option_window_colour": 255,
 }
diff --git a/options/operagx/options_operagx.yy b/options/operagx/options_operagx.yy
@@ -1,11 +1,27 @@
 {
-  "option_operagx_version": "1.0.0.0",
+  "resourceType": "GMOperaGXOptions",
+  "resourceVersion": "1.1",
+  "name": "operagx",
+  "option_operagx_display_cursor": true,
+  "option_operagx_editUrl": "",
   "option_operagx_game_name": "${project_name}",
+  "option_operagx_guid": "",
+  "option_operagx_internalShareUrl": "",
   "option_operagx_interpolate_pixels": true,
+  "option_operagx_mod_editUrl": "",
+  "option_operagx_mod_game_name": "${project_name}",
+  "option_operagx_mod_guid": "",
+  "option_operagx_mod_internalShareUrl": "",
+  "option_operagx_mod_next_version": "1.0.0.0",
+  "option_operagx_mod_publicShareUrl": "",
+  "option_operagx_mod_team_id": "",
+  "option_operagx_mod_team_name": "",
+  "option_operagx_mod_version": "1.0.0.0",
+  "option_operagx_next_version": "1.0.0.0",
+  "option_operagx_publicShareUrl": "",
   "option_operagx_scale": 0,
+  "option_operagx_team_id": "",
+  "option_operagx_team_name": "",
   "option_operagx_texture_page": "2048x2048",
-  "resourceVersion": "1.0",
-  "name": "operagx",
-  "tags": [],
-  "resourceType": "GMOperaGXOptions",
+  "option_operagx_version": "1.0.0.0",
 }