DrDuck0117 3 달 전
부모
커밋
13e6dc69d9
90개의 변경된 파일998개의 추가작업 그리고 287개의 파일을 삭제
  1. 12 5
      ddmyx.yyp
  2. 19 1
      notes/更新日志DrDuck/更新日志DrDuck.txt
  3. 10 0
      objects/oBreakableSolid/Create_0.gml
  4. 2 0
      objects/oBreakableSolid/Step_0.gml
  5. 44 0
      objects/oBreakableSolid/oBreakableSolid.yy
  6. 11 3
      objects/oEnemyFlying/Create_0.gml
  7. 2 2
      objects/oEnemyFlying/oEnemyFlying.yy
  8. 12 0
      objects/oEnemyFlyingTrack/Create_0.gml
  9. 7 0
      objects/oEnemyFlyingTrack/Draw_0.gml
  10. 42 0
      objects/oEnemyFlyingTrack/oEnemyFlyingTrack.yy
  11. 10 1
      objects/oEnemyHitbox/Create_0.gml
  12. 2 2
      objects/oEnemyHitbox/oEnemyHitbox.yy
  13. 1 9
      objects/oParentCollectable/Collision_oPlayer.gml
  14. 1 2
      objects/oParentCollectable/Create_0.gml
  15. 22 3
      objects/oParentEnemy/Create_0.gml
  16. 2 2
      objects/oParentEnemy/oParentEnemy.yy
  17. 4 4
      objects/oParentEntity/oParentEntity.yy
  18. 8 0
      objects/oParentHazard/Create_0.gml
  19. 5 3
      objects/oParentHazard/oParentHazard.yy
  20. 0 19
      objects/oParentPlayerHitbox/Create_0.gml
  21. 0 37
      objects/oParentPlayerHitbox/Step_0.gml
  22. 4 1
      objects/oParentSolid/oParentSolid.yy
  23. 0 33
      objects/oPlayerCredit/oPlayerCredit.yy
  24. 0 0
      objects/oPlayerHitbox/Alarm_0.gml
  25. 0 0
      objects/oPlayerHitbox/CleanUp_0.gml
  26. 23 0
      objects/oPlayerHitbox/Create_0.gml
  27. 26 0
      objects/oPlayerHitbox/Step_0.gml
  28. 2 2
      objects/oPlayerHitbox/oPlayerHitbox.yy
  29. 5 5
      objects/oPlayerHitboxArc/Create_0.gml
  30. 2 2
      objects/oPlayerHitboxArc/oPlayerHitboxArc.yy
  31. 18 10
      objects/oPlayerHitboxDown/Create_0.gml
  32. 4 4
      objects/oPlayerHitboxDown/oPlayerHitboxDown.yy
  33. 13 8
      objects/oPlayerHitboxHor/Create_0.gml
  34. 2 2
      objects/oPlayerHitboxHor/oPlayerHitboxHor.yy
  35. 2 2
      objects/oPlayerHitboxMark/Create_0.gml
  36. 2 2
      objects/oPlayerHitboxMark/oPlayerHitboxMark.yy
  37. 11 6
      objects/oPlayerHitboxUp/Create_0.gml
  38. 4 4
      objects/oPlayerHitboxUp/oPlayerHitboxUp.yy
  39. 0 1
      objects/oSpike/Create_0.gml
  40. 1 3
      objects/oSpike/oSpike.yy
  41. 1 1
      particles/peBladeHitEffect/peBladeHitEffect.yy
  42. 6 2
      rooms/rTest_1/rTest_1.yy
  43. 131 33
      rooms/rTest_2/rTest_2.yy
  44. 2 1
      scripts/DummyAI/DummyAI.gml
  45. 0 16
      scripts/EnemyStates/EnemyStates.gml
  46. 15 42
      scripts/FlyingAI/FlyingAI.gml
  47. 45 0
      scripts/FlyingTrackAI/FlyingTrackAI.gml
  48. 13 0
      scripts/FlyingTrackAI/FlyingTrackAI.yy
  49. 3 3
      scripts/PlayerStates/PlayerStates.gml
  50. 40 0
      scripts/general/general.gml
  51. BIN
      sprites/sBreakableSolid/5f8a516f-8580-4fa8-8b91-351f5998c6db.png
  52. BIN
      sprites/sBreakableSolid/88bb7138-ade4-44c5-bc2f-2291c403a678.png
  53. BIN
      sprites/sBreakableSolid/8f2bb299-97ae-4e5b-abc4-4fb1af6caacb.png
  54. BIN
      sprites/sBreakableSolid/b85b8ab1-6666-4562-9116-ba90cd3680d1.png
  55. BIN
      sprites/sBreakableSolid/layers/5f8a516f-8580-4fa8-8b91-351f5998c6db/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png
  56. BIN
      sprites/sBreakableSolid/layers/88bb7138-ade4-44c5-bc2f-2291c403a678/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png
  57. BIN
      sprites/sBreakableSolid/layers/8f2bb299-97ae-4e5b-abc4-4fb1af6caacb/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png
  58. BIN
      sprites/sBreakableSolid/layers/b85b8ab1-6666-4562-9116-ba90cd3680d1/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png
  59. 102 0
      sprites/sBreakableSolid/sBreakableSolid.yy
  60. BIN
      sprites/sEnemyFlying/313d19ac-423c-4585-89d5-d727c8a6382e.png
  61. BIN
      sprites/sEnemyFlying/4ed8f73b-89af-4d0c-b10b-18e16e3b7922.png
  62. BIN
      sprites/sEnemyFlying/7370f7a0-03b4-4707-a9fe-e4fee021830a.png
  63. BIN
      sprites/sEnemyFlying/7e0df1f3-28dc-45fa-b317-e7900ffb70e0.png
  64. BIN
      sprites/sEnemyFlyingTrack/313d19ac-423c-4585-89d5-d727c8a6382e.png
  65. BIN
      sprites/sEnemyFlyingTrack/4ed8f73b-89af-4d0c-b10b-18e16e3b7922.png
  66. BIN
      sprites/sEnemyFlyingTrack/7370f7a0-03b4-4707-a9fe-e4fee021830a.png
  67. BIN
      sprites/sEnemyFlyingTrack/7e0df1f3-28dc-45fa-b317-e7900ffb70e0.png
  68. BIN
      sprites/sEnemyFlyingTrack/layers/313d19ac-423c-4585-89d5-d727c8a6382e/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  69. BIN
      sprites/sEnemyFlyingTrack/layers/4ed8f73b-89af-4d0c-b10b-18e16e3b7922/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  70. BIN
      sprites/sEnemyFlyingTrack/layers/7370f7a0-03b4-4707-a9fe-e4fee021830a/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  71. BIN
      sprites/sEnemyFlyingTrack/layers/7e0df1f3-28dc-45fa-b317-e7900ffb70e0/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  72. 102 0
      sprites/sEnemyFlyingTrack/sEnemyFlyingTrack.yy
  73. BIN
      sprites/sEnemyFlyingTrackIdle/313d19ac-423c-4585-89d5-d727c8a6382e.png
  74. BIN
      sprites/sEnemyFlyingTrackIdle/4ed8f73b-89af-4d0c-b10b-18e16e3b7922.png
  75. BIN
      sprites/sEnemyFlyingTrackIdle/7370f7a0-03b4-4707-a9fe-e4fee021830a.png
  76. BIN
      sprites/sEnemyFlyingTrackIdle/7e0df1f3-28dc-45fa-b317-e7900ffb70e0.png
  77. BIN
      sprites/sEnemyFlyingTrackIdle/layers/313d19ac-423c-4585-89d5-d727c8a6382e/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  78. BIN
      sprites/sEnemyFlyingTrackIdle/layers/4ed8f73b-89af-4d0c-b10b-18e16e3b7922/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  79. BIN
      sprites/sEnemyFlyingTrackIdle/layers/7370f7a0-03b4-4707-a9fe-e4fee021830a/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  80. BIN
      sprites/sEnemyFlyingTrackIdle/layers/7e0df1f3-28dc-45fa-b317-e7900ffb70e0/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  81. 102 0
      sprites/sEnemyFlyingTrackIdle/sEnemyFlyingTrackIdle.yy
  82. BIN
      sprites/sHitboxDown/1218c0f1-724c-4ab3-94fd-98b4d8d18aba.png
  83. BIN
      sprites/sHitboxDown/layers/1218c0f1-724c-4ab3-94fd-98b4d8d18aba/697040fe-66b1-4c20-9282-88683dd20e44.png
  84. 90 0
      sprites/sHitboxDown/sHitboxDown.yy
  85. 2 2
      sprites/sHitboxHor/sHitboxHor.yy
  86. BIN
      sprites/sHitboxUp/1218c0f1-724c-4ab3-94fd-98b4d8d18aba.png
  87. BIN
      sprites/sHitboxUp/layers/1218c0f1-724c-4ab3-94fd-98b4d8d18aba/697040fe-66b1-4c20-9282-88683dd20e44.png
  88. 9 9
      sprites/sHitboxUp/sHitboxUp.yy
  89. BIN
      sprites/sHitboxVer/1218c0f1-724c-4ab3-94fd-98b4d8d18aba.png
  90. BIN
      sprites/sHitboxVer/layers/1218c0f1-724c-4ab3-94fd-98b4d8d18aba/697040fe-66b1-4c20-9282-88683dd20e44.png

+ 12 - 5
ddmyx.yyp

@@ -12,10 +12,11 @@
   "Folders":[
     {"$GMFolder":"","%Name":"CoreObjects","folderPath":"folders/CoreObjects.yy","name":"CoreObjects","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"Enemy","folderPath":"folders/Enemy.yy","name":"Enemy","resourceType":"GMFolder","resourceVersion":"2.0",},
+    {"$GMFolder":"","%Name":"oEnemyFlying","folderPath":"folders/Enemy/oEnemyFlying.yy","name":"oEnemyFlying","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"oEnemyCorpse","folderPath":"folders/Enemy/oEnemyCorpse.yy","name":"oEnemyCorpse","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"oEnemyCrawl","folderPath":"folders/Enemy/oEnemyCrawl.yy","name":"oEnemyCrawl","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"oEnemyDummy","folderPath":"folders/Enemy/oEnemyDummy.yy","name":"oEnemyDummy","resourceType":"GMFolder","resourceVersion":"2.0",},
-    {"$GMFolder":"","%Name":"oEnemyFlying","folderPath":"folders/Enemy/oEnemyFlying.yy","name":"oEnemyFlying","resourceType":"GMFolder","resourceVersion":"2.0",},
+    {"$GMFolder":"","%Name":"oEnemyFlyingTrack","folderPath":"folders/Enemy/oEnemyFlyingTrack.yy","name":"oEnemyFlyingTrack","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"ParticleEffects","folderPath":"folders/ParticleEffects.yy","name":"ParticleEffects","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"Player","folderPath":"folders/Player.yy","name":"Player","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"Hitbox","folderPath":"folders/Player/Hitbox.yy","name":"Hitbox","resourceType":"GMFolder","resourceVersion":"2.0",},
@@ -50,6 +51,7 @@
     {"id":{"name":"更新日志tianhaobu","path":"notes/更新日志tianhaobu/更新日志tianhaobu.yy",},},
     {"id":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},},
     {"id":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},},
+    {"id":{"name":"oBreakableSolid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},},
     {"id":{"name":"oCamera","path":"objects/oCamera/oCamera.yy",},},
     {"id":{"name":"oCredit","path":"objects/oCredit/oCredit.yy",},},
     {"id":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},},
@@ -58,23 +60,23 @@
     {"id":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},},
     {"id":{"name":"oEnemyDummy","path":"objects/oEnemyDummy/oEnemyDummy.yy",},},
     {"id":{"name":"oEnemyFlying","path":"objects/oEnemyFlying/oEnemyFlying.yy",},},
+    {"id":{"name":"oEnemyFlyingTrack","path":"objects/oEnemyFlyingTrack/oEnemyFlyingTrack.yy",},},
     {"id":{"name":"oEnemyHitbox","path":"objects/oEnemyHitbox/oEnemyHitbox.yy",},},
     {"id":{"name":"oFade","path":"objects/oFade/oFade.yy",},},
     {"id":{"name":"oInGameManager","path":"objects/oInGameManager/oInGameManager.yy",},},
     {"id":{"name":"oInteractIndicator","path":"objects/oInteractIndicator/oInteractIndicator.yy",},},
     {"id":{"name":"oInventory","path":"objects/oInventory/oInventory.yy",},},
     {"id":{"name":"oMain","path":"objects/oMain/oMain.yy",},},
-    {"id":{"name":"oParentAttackable","path":"objects/oParentAttackable/oParentAttackable.yy",},},
     {"id":{"name":"oParentCollectable","path":"objects/oParentCollectable/oParentCollectable.yy",},},
     {"id":{"name":"oParentEnemy","path":"objects/oParentEnemy/oParentEnemy.yy",},},
+    {"id":{"name":"oParentEntity","path":"objects/oParentEntity/oParentEntity.yy",},},
     {"id":{"name":"oParentHazard","path":"objects/oParentHazard/oParentHazard.yy",},},
     {"id":{"name":"oParentInteractive","path":"objects/oParentInteractive/oParentInteractive.yy",},},
-    {"id":{"name":"oParentPlayerHitbox","path":"objects/oParentPlayerHitbox/oParentPlayerHitbox.yy",},},
     {"id":{"name":"oParentSolid","path":"objects/oParentSolid/oParentSolid.yy",},},
     {"id":{"name":"oParticleManager","path":"objects/oParticleManager/oParticleManager.yy",},},
     {"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},},
     {"id":{"name":"oPlayerAfterImage","path":"objects/oPlayerAfterImage/oPlayerAfterImage.yy",},},
-    {"id":{"name":"oPlayerCredit","path":"objects/oPlayerCredit/oPlayerCredit.yy",},},
+    {"id":{"name":"oPlayerHitbox","path":"objects/oPlayerHitbox/oPlayerHitbox.yy",},},
     {"id":{"name":"oPlayerHitboxArc","path":"objects/oPlayerHitboxArc/oPlayerHitboxArc.yy",},},
     {"id":{"name":"oPlayerHitboxDown","path":"objects/oPlayerHitboxDown/oPlayerHitboxDown.yy",},},
     {"id":{"name":"oPlayerHitboxHor","path":"objects/oPlayerHitboxHor/oPlayerHitboxHor.yy",},},
@@ -92,6 +94,7 @@
     {"id":{"name":"DummyAI","path":"scripts/DummyAI/DummyAI.yy",},},
     {"id":{"name":"EnemyStates","path":"scripts/EnemyStates/EnemyStates.yy",},},
     {"id":{"name":"FlyingAI","path":"scripts/FlyingAI/FlyingAI.yy",},},
+    {"id":{"name":"FlyingTrackAI","path":"scripts/FlyingTrackAI/FlyingTrackAI.yy",},},
     {"id":{"name":"General","path":"scripts/General/General.yy",},},
     {"id":{"name":"Interaction","path":"scripts/Interaction/Interaction.yy",},},
     {"id":{"name":"PlayerStates","path":"scripts/PlayerStates/PlayerStates.yy",},},
@@ -101,6 +104,7 @@
     {"id":{"name":"sBladeHitEffect","path":"sprites/sBladeHitEffect/sBladeHitEffect.yy",},},
     {"id":{"name":"sBlockClimbable","path":"sprites/sBlockClimbable/sBlockClimbable.yy",},},
     {"id":{"name":"sBlockSlippery","path":"sprites/sBlockSlippery/sBlockSlippery.yy",},},
+    {"id":{"name":"sBreakableSolid","path":"sprites/sBreakableSolid/sBreakableSolid.yy",},},
     {"id":{"name":"sCredit","path":"sprites/sCredit/sCredit.yy",},},
     {"id":{"name":"sDoor","path":"sprites/sDoor/sDoor.yy",},},
     {"id":{"name":"sDoubleJumpEffect","path":"sprites/sDoubleJumpEffect/sDoubleJumpEffect.yy",},},
@@ -109,13 +113,16 @@
     {"id":{"name":"sEnemyDummyCounter","path":"sprites/sEnemyDummyCounter/sEnemyDummyCounter.yy",},},
     {"id":{"name":"sEnemyDummyIdle","path":"sprites/sEnemyDummyIdle/sEnemyDummyIdle.yy",},},
     {"id":{"name":"sEnemyFlying","path":"sprites/sEnemyFlying/sEnemyFlying.yy",},},
+    {"id":{"name":"sEnemyFlyingTrack","path":"sprites/sEnemyFlyingTrack/sEnemyFlyingTrack.yy",},},
+    {"id":{"name":"sEnemyFlyingTrackIdle","path":"sprites/sEnemyFlyingTrackIdle/sEnemyFlyingTrackIdle.yy",},},
     {"id":{"name":"sEnemyHitboxBC","path":"sprites/sEnemyHitboxBC/sEnemyHitboxBC.yy",},},
     {"id":{"name":"sEnemyHitboxMC","path":"sprites/sEnemyHitboxMC/sEnemyHitboxMC.yy",},},
     {"id":{"name":"sEnemyHitboxML","path":"sprites/sEnemyHitboxML/sEnemyHitboxML.yy",},},
     {"id":{"name":"sHitboxArc","path":"sprites/sHitboxArc/sHitboxArc.yy",},},
+    {"id":{"name":"sHitboxDown","path":"sprites/sHitboxDown/sHitboxDown.yy",},},
     {"id":{"name":"sHitboxHor","path":"sprites/sHitboxHor/sHitboxHor.yy",},},
     {"id":{"name":"sHitboxMark","path":"sprites/sHitboxMark/sHitboxMark.yy",},},
-    {"id":{"name":"sHitboxVer","path":"sprites/sHitboxVer/sHitboxVer.yy",},},
+    {"id":{"name":"sHitboxUp","path":"sprites/sHitboxUp/sHitboxUp.yy",},},
     {"id":{"name":"sInteractIndicator","path":"sprites/sInteractIndicator/sInteractIndicator.yy",},},
     {"id":{"name":"sPlayerArcSlash","path":"sprites/sPlayerArcSlash/sPlayerArcSlash.yy",},},
     {"id":{"name":"sPlayerAttack","path":"sprites/sPlayerAttack/sPlayerAttack.yy",},},

+ 19 - 1
notes/更新日志DrDuck/更新日志DrDuck.txt

@@ -185,4 +185,22 @@ global.player是游戏内玩家inst_id
 
 2025/2/23 DrDuck
 
-1. 昨天鸽了一天……
+1. 昨天鸽了一天……
+
+2. 发现了一个超级好用的功能!选中一个函数/变量后ctrl + r可以全局替换
+不知道对别的文本可不可行,好像必须是编译器能够识别的定义类文本
+
+3. 补全oEnemyFlying代码
+
+4. 新增oEnemyFlyingTrack敌人
+
+5. 修改rTest_2, 加入单向门
+注意单向门的get_hit()需要改善!!目前是测试版!
+
+6. 优化玩家碰撞箱逻辑中……考虑改为鸭子类型逻辑
+对所有oParentEntity定义get_hit()函数作为受击反馈(sound, pe, 变量例如血量扣除等)
+在oPlayerHitbox中定义hit_feedback(_receiver)与feedback_activated作为玩家攻击反馈
+具体优化过程极为复杂
+
+7. 新增oParentEntity作为几乎所有可交互(实际上是具有受击反馈)对象的父类!
+比如oParentSolid, oParentEnemy...

+ 10 - 0
objects/oBreakableSolid/Create_0.gml

@@ -0,0 +1,10 @@
+self_check_destroy();
+
+image_speed = 0;
+animation_spd = 1;
+
+get_hit = function(_info)
+{
+	if _info.sourceY < y
+		image_index++;
+}

+ 2 - 0
objects/oBreakableSolid/Step_0.gml

@@ -0,0 +1,2 @@
+if animation_end()
+	self_record_destroy();

+ 44 - 0
objects/oBreakableSolid/oBreakableSolid.yy

@@ -0,0 +1,44 @@
+{
+  "$GMObject":"",
+  "%Name":"oBreakableSolid",
+  "eventList":[
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
+  "managed":true,
+  "name":"oBreakableSolid",
+  "overriddenProperties":[],
+  "parent":{
+    "name":"SolidObjects",
+    "path":"folders/StationaryObjects/SolidObjects.yy",
+  },
+  "parentObjectId":{
+    "name":"oParentSolid",
+    "path":"objects/oParentSolid/oParentSolid.yy",
+  },
+  "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":[
+    {"$GMObjectProperty":"v2","%Name":"uuid","filters":[],"listItems":[],"multiselect":false,"name":"uuid","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"","varType":2,},
+  ],
+  "resourceType":"GMObject",
+  "resourceVersion":"2.0",
+  "solid":false,
+  "spriteId":{
+    "name":"sBreakableSolid",
+    "path":"sprites/sBreakableSolid/sBreakableSolid.yy",
+  },
+  "spriteMaskId":null,
+  "visible":true,
+}

+ 11 - 3
objects/oEnemyFlying/Create_0.gml

@@ -1,8 +1,16 @@
 event_inherited();
 
-flying_spd = 2.5;
-hp = 150;
+hp = 15;
+
+fly_spd = 5;
+var _dir = random(360);
+x_base_spd = lengthdir_x(fly_spd, _dir);
+y_base_spd = lengthdir_y(fly_spd, _dir);
+
+facing_y = 1;
 
 enemy_ai = enemy_flying_ai;
 
-hitbox = enemy_create_hitbox(48, 48);
+hitbox = enemy_create_hitboxMC(56, 56);
+
+set_sprite(sEnemyFlying);

+ 2 - 2
objects/oEnemyFlying/oEnemyFlying.yy

@@ -33,8 +33,8 @@
   "resourceVersion":"2.0",
   "solid":false,
   "spriteId":{
-    "name":"sEnemyFlying",
-    "path":"sprites/sEnemyFlying/sEnemyFlying.yy",
+    "name":"sEnemyFlyingTrack",
+    "path":"sprites/sEnemyFlyingTrack/sEnemyFlyingTrack.yy",
   },
   "spriteMaskId":null,
   "visible":true,

+ 12 - 0
objects/oEnemyFlyingTrack/Create_0.gml

@@ -0,0 +1,12 @@
+event_inherited();
+
+x_spd = 0;
+y_spd = 0;
+max_spd = 6;
+range = 1080;
+acc = 0.125;
+hp = 100;
+
+enemy_ai = enemy_flying_track_ai;
+
+hitbox = enemy_create_hitboxMC(56, 56);

+ 7 - 0
objects/oEnemyFlyingTrack/Draw_0.gml

@@ -0,0 +1,7 @@
+// Inherit the parent event
+event_inherited();
+
+if global.developer_mode
+{
+    draw_line(x, y, oPlayer.x, oPlayer.y - 1);
+}

+ 42 - 0
objects/oEnemyFlyingTrack/oEnemyFlyingTrack.yy

@@ -0,0 +1,42 @@
+{
+  "$GMObject":"",
+  "%Name":"oEnemyFlyingTrack",
+  "eventList":[
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
+  "managed":true,
+  "name":"oEnemyFlyingTrack",
+  "overriddenProperties":[],
+  "parent":{
+    "name":"oEnemyFlyingTrack",
+    "path":"folders/Enemy/oEnemyFlyingTrack.yy",
+  },
+  "parentObjectId":{
+    "name":"oParentEnemy",
+    "path":"objects/oParentEnemy/oParentEnemy.yy",
+  },
+  "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":[],
+  "resourceType":"GMObject",
+  "resourceVersion":"2.0",
+  "solid":false,
+  "spriteId":{
+    "name":"sEnemyFlyingTrack",
+    "path":"sprites/sEnemyFlyingTrack/sEnemyFlyingTrack.yy",
+  },
+  "spriteMaskId":null,
+  "visible":true,
+}

+ 10 - 1
objects/oEnemyHitbox/Create_0.gml

@@ -4,4 +4,13 @@ owner = noone;
 hitbox_type = "COLLISION";
 
 x_offset = 0;
-y_offset = 0;
+y_offset = 0;
+
+get_hit = function(_info)
+{
+	if hitbox_type == "BLADE"
+	{
+		global.hitstop = 12;
+		// se, pe...
+	}
+}

+ 2 - 2
objects/oEnemyHitbox/oEnemyHitbox.yy

@@ -13,8 +13,8 @@
     "path":"folders/Enemy.yy",
   },
   "parentObjectId":{
-    "name":"oParentAttackable",
-    "path":"objects/oParentAttackable/oParentAttackable.yy",
+    "name":"oParentEntity",
+    "path":"objects/oParentEntity/oParentEntity.yy",
   },
   "persistent":false,
   "physicsAngularDamping":0.1,

+ 1 - 9
objects/oParentCollectable/Collision_oPlayer.gml

@@ -1,9 +1 @@
-var _list = global.save_data.world.destroyed_objects;
-
-_list[$ uuid] = true;
-
-callback();
-
-save_game_to_disk();
-
-instance_destroy();
+self_record_destroy(callback);

+ 1 - 2
objects/oParentCollectable/Create_0.gml

@@ -1,4 +1,3 @@
-if struct_exists(global.save_data.world.destroyed_objects, uuid)
-    instance_destroy();
+self_check_destroy();
 	
 callback = function(){};

+ 22 - 3
objects/oParentEnemy/Create_0.gml

@@ -1,3 +1,24 @@
+get_hit = function(_info)
+{
+	player_add_INK(1);
+	
+	flash_timer = 6;
+	flash_duration = 6;
+	
+	hp -= _info.damage;
+    
+    hitstun_timer = hitstun_max;
+
+    x_spd_kb = _info.kbFactorX * kb_factor;
+	y_spd_kb = _info.kbFactorY * kb_factor;
+
+    if hp <= 0
+	{
+        is_dead = true;
+        instance_destroy();
+    }
+};
+
 x_spd = 0;
 y_spd = 0;
 facing = 1;
@@ -21,11 +42,9 @@ enemy_ai = function(){};
 animation_spd = 0.25;
 image_speed = 0;
 
-get_hit = false;
-
 hitbox = noone;
 
 // shader
 flash_timer = 0;
-flash_timer = 0;
+flash_duration = 0;
 u_flash_alpha = shader_get_uniform(sh_flash, "f_alpha");

+ 2 - 2
objects/oParentEnemy/oParentEnemy.yy

@@ -16,8 +16,8 @@
     "path":"folders/Enemy.yy",
   },
   "parentObjectId":{
-    "name":"oParentAttackable",
-    "path":"objects/oParentAttackable/oParentAttackable.yy",
+    "name":"oParentEntity",
+    "path":"objects/oParentEntity/oParentEntity.yy",
   },
   "persistent":false,
   "physicsAngularDamping":0.1,

+ 4 - 4
objects/oParentAttackable/oParentAttackable.yy → objects/oParentEntity/oParentEntity.yy

@@ -1,13 +1,13 @@
 {
   "$GMObject":"",
-  "%Name":"oParentAttackable",
+  "%Name":"oParentEntity",
   "eventList":[],
   "managed":true,
-  "name":"oParentAttackable",
+  "name":"oParentEntity",
   "overriddenProperties":[],
   "parent":{
-    "name":"Enemy",
-    "path":"folders/Enemy.yy",
+    "name":"CoreObjects",
+    "path":"folders/CoreObjects.yy",
   },
   "parentObjectId":null,
   "persistent":false,

+ 8 - 0
objects/oParentHazard/Create_0.gml

@@ -0,0 +1,8 @@
+damage = 1;
+
+get_hit = function(_info)
+{
+	return;
+	//pe
+	//se
+};

+ 5 - 3
objects/oParentHazard/oParentHazard.yy

@@ -1,7 +1,9 @@
 {
   "$GMObject":"",
   "%Name":"oParentHazard",
-  "eventList":[],
+  "eventList":[
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
   "managed":true,
   "name":"oParentHazard",
   "overriddenProperties":[],
@@ -10,8 +12,8 @@
     "path":"folders/StationaryObjects/HazardObjects.yy",
   },
   "parentObjectId":{
-    "name":"oParentAttackable",
-    "path":"objects/oParentAttackable/oParentAttackable.yy",
+    "name":"oParentEntity",
+    "path":"objects/oParentEntity/oParentEntity.yy",
   },
   "persistent":false,
   "physicsAngularDamping":0.1,

+ 0 - 19
objects/oParentPlayerHitbox/Create_0.gml

@@ -1,19 +0,0 @@
-owner = noone;
-damage = 1;
-
-hit_list = ds_list_create();
-
-x_offset = 0;
-y_offset = 0;
-
-kb_factor_x = 1.0;
-kb_factor_y = 1.0;
-
-alarm[0] = 8;
-
-hit_feedback = function(_owner){};
-
-if global.developer_mode
-	image_blend = c_red;
-else
-	image_alpha = 0;

+ 0 - 37
objects/oParentPlayerHitbox/Step_0.gml

@@ -1,37 +0,0 @@
-if !instance_exists(owner)
-	instance_destroy();
-
-x = owner.x + x_offset;
-y = owner.y + y_offset;
-
-var _temp_list = ds_list_create();
-var _num = instance_place_list(x, y, oParentAttackable, _temp_list, false);
-
-for (var i = 0; i < _num; i++)
-{
-    var _inst = _temp_list[| i];
-
-    if ds_list_find_index(hit_list, _inst) == -1 && instance_exists(_inst)
-	{
-		if ds_list_empty(hit_list)
-			hit_feedback(owner);
-		if _inst.object_index == oEnemyHitbox
-			if _inst.hitbox_type = "BLADE"
-				global.hitstop = 10;
-		if object_is_ancestor(_inst.object_index, oParentEnemy)
-		{
-			if global.playerINK < global.save_data.player.maxINK
-				global.playerINK += 1;
-            with(_inst)
-			{
-				enemy_get_hit(other.damage, other.kb_factor_x, other.kb_factor_y);
-				flash_timer = 6;
-				flash_duration = 6;
-				
-				part_particles_burst(global.blade_hit_effect, x, y, peBladeHitEffect)
-			}
-		}
-		ds_list_add(hit_list, _inst);
-    }
-}
-ds_list_destroy(_temp_list);

+ 4 - 1
objects/oParentSolid/oParentSolid.yy

@@ -9,7 +9,10 @@
     "name":"SolidObjects",
     "path":"folders/StationaryObjects/SolidObjects.yy",
   },
-  "parentObjectId":null,
+  "parentObjectId":{
+    "name":"oParentEntity",
+    "path":"objects/oParentEntity/oParentEntity.yy",
+  },
   "persistent":false,
   "physicsAngularDamping":0.1,
   "physicsDensity":0.5,

+ 0 - 33
objects/oPlayerCredit/oPlayerCredit.yy

@@ -1,33 +0,0 @@
-{
-  "$GMObject":"",
-  "%Name":"oPlayerCredit",
-  "eventList":[],
-  "managed":true,
-  "name":"oPlayerCredit",
-  "overriddenProperties":[],
-  "parent":{
-    "name":"Player",
-    "path":"folders/Player.yy",
-  },
-  "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":[],
-  "resourceType":"GMObject",
-  "resourceVersion":"2.0",
-  "solid":false,
-  "spriteId":null,
-  "spriteMaskId":null,
-  "visible":true,
-}

+ 0 - 0
objects/oParentPlayerHitbox/Alarm_0.gml → objects/oPlayerHitbox/Alarm_0.gml


+ 0 - 0
objects/oParentPlayerHitbox/CleanUp_0.gml → objects/oPlayerHitbox/CleanUp_0.gml


+ 23 - 0
objects/oPlayerHitbox/Create_0.gml

@@ -0,0 +1,23 @@
+owner = noone;
+
+hit_list = ds_list_create();
+
+x_offset = 0;
+y_offset = 0;
+
+alarm[0] = 8;
+
+feedback_activated = false;
+hit_feedback = function(_owner, _inst){};
+hit_info = {
+	damage: 1,
+	kbFactorX: 1.0,
+	kbFactorY: 1.0,
+	sourceX: -1,
+	sourceY: -1
+};
+
+if global.developer_mode
+	image_blend = c_red;
+else
+	image_alpha = 0;

+ 26 - 0
objects/oPlayerHitbox/Step_0.gml

@@ -0,0 +1,26 @@
+if !instance_exists(owner)
+	instance_destroy();
+
+x = owner.x + x_offset;
+y = owner.y + y_offset;
+
+var _temp_list = ds_list_create();
+var _num = instance_place_list(x, y, oParentEntity, _temp_list, false);
+
+for (var i = 0; i < _num; i++)
+{
+    var _inst = _temp_list[| i];
+
+    if ds_list_find_index(hit_list, _inst) == -1 && instance_exists(_inst)
+	{
+		if !feedback_activated
+			hit_feedback(_inst);
+		
+		if variable_instance_exists(_inst, "get_hit")
+		// && is_method(_inst.get_hit)
+			_inst.get_hit(hit_info);
+
+		ds_list_add(hit_list, _inst);
+    }
+}
+ds_list_destroy(_temp_list);

+ 2 - 2
objects/oParentPlayerHitbox/oParentPlayerHitbox.yy → objects/oPlayerHitbox/oPlayerHitbox.yy

@@ -1,6 +1,6 @@
 {
   "$GMObject":"",
-  "%Name":"oParentPlayerHitbox",
+  "%Name":"oPlayerHitbox",
   "eventList":[
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":12,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
@@ -8,7 +8,7 @@
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
   ],
   "managed":true,
-  "name":"oParentPlayerHitbox",
+  "name":"oPlayerHitbox",
   "overriddenProperties":[],
   "parent":{
     "name":"Hitbox",

+ 5 - 5
objects/oPlayerHitboxArc/Create_0.gml

@@ -5,11 +5,11 @@ damage = 20;
 kb_factor_x = 100;
 kb_factor_y = -20;
 
-hit_feedback = function(_owner)
+hit_feedback = function(_receiver)
 {
-	_owner.y_spd = _owner.jump_spd * 0.8;
-	_owner.jump_cnt = 1;
-	_owner.can_dash = true;
-	_owner.coyote_timer = 0;
+	global.player.y_spd = global.player.jump_spd * 0.8;
+	global.player.jump_cnt = 1;
+	global.player.can_dash = true;
+	global.player.coyote_timer = 0;
 	global.hitstop = 30;
 }

+ 2 - 2
objects/oPlayerHitboxArc/oPlayerHitboxArc.yy

@@ -12,8 +12,8 @@
     "path":"folders/Player/Hitbox.yy",
   },
   "parentObjectId":{
-    "name":"oParentPlayerHitbox",
-    "path":"objects/oParentPlayerHitbox/oParentPlayerHitbox.yy",
+    "name":"oPlayerHitbox",
+    "path":"objects/oPlayerHitbox/oPlayerHitbox.yy",
   },
   "persistent":false,
   "physicsAngularDamping":0.1,

+ 18 - 10
objects/oPlayerHitboxDown/Create_0.gml

@@ -1,13 +1,21 @@
 event_inherited();
 
-damage = 5;
-
-kb_factor_y = -10;
-
-hit_feedback = function(_owner)
+hit_feedback = function(_receiver)
 {
-	_owner.y_spd = _owner.jump_spd * 0.6;
-	_owner.jump_cnt = 1;
-	_owner.can_dash = true;
-	_owner.coyote_timer = 0;
-}
+	if !object_is_ancestor(_receiver.object_index, oParentSolid)
+	{
+		global.player.y_spd = global.player.jump_spd * 0.6;
+		global.player.jump_cnt = 1;
+		global.player.can_dash = true;
+		global.player.coyote_timer = 0;
+		
+		feedback_activated = true;
+	}
+}
+hit_info = {
+	damage: 5,
+	kbFactorX: 0.0,
+	kbFactorY: 5.0,
+	sourceX: x,
+	sourceY: y
+};

+ 4 - 4
objects/oPlayerHitboxDown/oPlayerHitboxDown.yy

@@ -12,8 +12,8 @@
     "path":"folders/Player/Hitbox.yy",
   },
   "parentObjectId":{
-    "name":"oParentPlayerHitbox",
-    "path":"objects/oParentPlayerHitbox/oParentPlayerHitbox.yy",
+    "name":"oPlayerHitbox",
+    "path":"objects/oPlayerHitbox/oPlayerHitbox.yy",
   },
   "persistent":false,
   "physicsAngularDamping":0.1,
@@ -33,8 +33,8 @@
   "resourceVersion":"2.0",
   "solid":false,
   "spriteId":{
-    "name":"sHitboxVer",
-    "path":"sprites/sHitboxVer/sHitboxVer.yy",
+    "name":"sHitboxDown",
+    "path":"sprites/sHitboxDown/sHitboxDown.yy",
   },
   "spriteMaskId":null,
   "visible":true,

+ 13 - 8
objects/oPlayerHitboxHor/Create_0.gml

@@ -1,12 +1,17 @@
 event_inherited();
 
-damage = 5;
-
-kb_factor_x = 15;
-
-hit_feedback = function(_owner)
+hit_feedback = function(_receiver)
 {
-	_owner.x_spd = - _owner.facing * 3;
-	_owner.move_lock_timer = 6;
+	global.player.x_spd = - global.player.facing * 3;
+	global.player.move_lock_timer = 6;
 	global.hitstop = 2;
-}
+	
+	feedback_activated = true;
+}
+hit_info = {
+	damage: 5,
+	kbFactorX: 15.0,
+	kbFactorY: 0.0,
+	sourceX: x,
+	sourceY: y
+};

+ 2 - 2
objects/oPlayerHitboxHor/oPlayerHitboxHor.yy

@@ -12,8 +12,8 @@
     "path":"folders/Player/Hitbox.yy",
   },
   "parentObjectId":{
-    "name":"oParentPlayerHitbox",
-    "path":"objects/oParentPlayerHitbox/oParentPlayerHitbox.yy",
+    "name":"oPlayerHitbox",
+    "path":"objects/oPlayerHitbox/oPlayerHitbox.yy",
   },
   "persistent":false,
   "physicsAngularDamping":0.1,

+ 2 - 2
objects/oPlayerHitboxMark/Create_0.gml

@@ -4,7 +4,7 @@ damage = 5;
 
 kb_factor_y = -15;
 
-hit_feedback = function(_owner)
+hit_feedback = function(_receiver)
 {
-	owner.is_marked = true;
+	global.player.is_marked = true;
 }

+ 2 - 2
objects/oPlayerHitboxMark/oPlayerHitboxMark.yy

@@ -12,8 +12,8 @@
     "path":"folders/Player/Hitbox.yy",
   },
   "parentObjectId":{
-    "name":"oParentPlayerHitbox",
-    "path":"objects/oParentPlayerHitbox/oParentPlayerHitbox.yy",
+    "name":"oPlayerHitbox",
+    "path":"objects/oPlayerHitbox/oPlayerHitbox.yy",
   },
   "persistent":false,
   "physicsAngularDamping":0.1,

+ 11 - 6
objects/oPlayerHitboxUp/Create_0.gml

@@ -1,10 +1,15 @@
 event_inherited();
 
-damage = 5;
-
-kb_factor_y = -10;
-
-hit_feedback = function(_owner)
+hit_feedback = function(_receiver)
 {
 	global.hitstop = 2;
-}
+	
+	feedback_activated = true;
+}
+hit_info = {
+	damage: 5,
+	kbFactorX: 0.0,
+	kbFactorY: -10.0,
+	sourceX: x,
+	sourceY: y
+};

+ 4 - 4
objects/oPlayerHitboxUp/oPlayerHitboxUp.yy

@@ -12,8 +12,8 @@
     "path":"folders/Player/Hitbox.yy",
   },
   "parentObjectId":{
-    "name":"oParentPlayerHitbox",
-    "path":"objects/oParentPlayerHitbox/oParentPlayerHitbox.yy",
+    "name":"oPlayerHitbox",
+    "path":"objects/oPlayerHitbox/oPlayerHitbox.yy",
   },
   "persistent":false,
   "physicsAngularDamping":0.1,
@@ -33,8 +33,8 @@
   "resourceVersion":"2.0",
   "solid":false,
   "spriteId":{
-    "name":"sHitboxVer",
-    "path":"sprites/sHitboxVer/sHitboxVer.yy",
+    "name":"sHitboxUp",
+    "path":"sprites/sHitboxUp/sHitboxUp.yy",
   },
   "spriteMaskId":null,
   "visible":true,

+ 0 - 1
objects/oSpike/Create_0.gml

@@ -1 +0,0 @@
-damage = 1;

+ 1 - 3
objects/oSpike/oSpike.yy

@@ -1,9 +1,7 @@
 {
   "$GMObject":"",
   "%Name":"oSpike",
-  "eventList":[
-    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
-  ],
+  "eventList":[],
   "managed":true,
   "name":"oSpike",
   "overriddenProperties":[],

+ 1 - 1
particles/peBladeHitEffect/peBladeHitEffect.yy

@@ -9,7 +9,7 @@
   "backdropYOffset":0.0,
   "drawOrder":0,
   "emitters":[
-    {"$GMPSEmitter":"","%Name":"Emitter","additiveBlend":false,"directionIncrease":0.0,"directionMax":15.0,"directionMin":-15.0,"directionWiggle":0.0,"distribution":0,"editorColour":1090519039,"editorDrawShape":true,"emitCount":8,"emitDelayMax":0.0,"emitDelayMin":0.0,"emitDelayUnits":0,"emitIntervalMax":0.0,"emitIntervalMin":0.0,"emitIntervalUnits":0,"enabled":true,"endColour":2164260863,"GMPresetName":null,"gravityDirection":0.0,"gravityForce":0.0,"headPosition":0.0,"lifetimeMax":12.0,"lifetimeMin":10.0,"linkedEmitter":null,"locked":false,"midColour":4294967295,"mode":1,"name":"Emitter","orientationIncrease":0.0,"orientationMax":0.0,"orientationMin":0.0,"orientationRelative":true,"orientationWiggle":0.0,"regionH":0.0,"regionW":0.0,"regionX":0.0,"regionY":0.0,"resourceType":"GMPSEmitter","resourceVersion":"2.0","scaleX":1.0,"scaleY":1.0,"shape":0,"sizeIncrease":0.01,"sizeMax":2.0,"sizeMin":1.5,"sizeWiggle":0.0,"spawnOnDeathCount":1,"spawnOnDeathGMPreset":null,"spawnOnDeathId":null,"spawnOnUpdateCount":1,"spawnOnUpdateGMPreset":null,"spawnOnUpdateId":null,"speedIncrease":0.0,"speedMax":15.0,"speedMin":10.0,"speedWiggle":0.0,"spriteAnimate":false,"spriteId":{"name":"sBladeHitEffect","path":"sprites/sBladeHitEffect/sBladeHitEffect.yy",},"spriteRandom":false,"spriteStretch":false,"startColour":4294967295,"texture":-1,},
+    {"$GMPSEmitter":"","%Name":"Emitter","additiveBlend":false,"directionIncrease":0.0,"directionMax":20.0,"directionMin":-20.0,"directionWiggle":0.0,"distribution":0,"editorColour":1090519039,"editorDrawShape":true,"emitCount":8,"emitDelayMax":0.0,"emitDelayMin":0.0,"emitDelayUnits":0,"emitIntervalMax":0.0,"emitIntervalMin":0.0,"emitIntervalUnits":0,"enabled":true,"endColour":2164260863,"GMPresetName":null,"gravityDirection":0.0,"gravityForce":0.0,"headPosition":0.0,"lifetimeMax":12.0,"lifetimeMin":10.0,"linkedEmitter":null,"locked":false,"midColour":2164260863,"mode":1,"name":"Emitter","orientationIncrease":0.0,"orientationMax":0.0,"orientationMin":0.0,"orientationRelative":true,"orientationWiggle":0.0,"regionH":0.0,"regionW":0.0,"regionX":0.0,"regionY":0.0,"resourceType":"GMPSEmitter","resourceVersion":"2.0","scaleX":2.0,"scaleY":1.0,"shape":0,"sizeIncrease":0.05,"sizeMax":1.0,"sizeMin":0.5,"sizeWiggle":0.0,"spawnOnDeathCount":1,"spawnOnDeathGMPreset":null,"spawnOnDeathId":null,"spawnOnUpdateCount":1,"spawnOnUpdateGMPreset":null,"spawnOnUpdateId":null,"speedIncrease":0.0,"speedMax":15.0,"speedMin":10.0,"speedWiggle":0.0,"spriteAnimate":false,"spriteId":{"name":"sBladeHitEffect","path":"sprites/sBladeHitEffect/sBladeHitEffect.yy",},"spriteRandom":false,"spriteStretch":false,"startColour":4294967295,"texture":-1,},
   ],
   "name":"peBladeHitEffect",
   "parent":{

+ 6 - 2
rooms/rTest_1/rTest_1.yy

@@ -516,6 +516,8 @@
     {"name":"inst_69C973EB","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_10A9A902","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_4F0A848A","path":"rooms/rTest_1/rTest_1.yy",},
+    {"name":"inst_18CEEF87","path":"rooms/rTest_1/rTest_1.yy",},
+    {"name":"inst_3DD23708","path":"rooms/rTest_1/rTest_1.yy",},
   ],
   "isDnd":false,
   "layers":[
@@ -794,7 +796,7 @@
         {"$GMRInstance":"v4","%Name":"inst_1E44B4D9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1E44B4D9","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":32.0,},
         {"$GMRInstance":"v4","%Name":"inst_2CB43C9C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2CB43C9C","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":1568.0,},
         {"$GMRInstance":"v4","%Name":"inst_5F4BAC79","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5F4BAC79","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":1632.0,},
-        {"$GMRInstance":"v4","%Name":"inst_5E5580F8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5E5580F8","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":1568.0,},
+        {"$GMRInstance":"v4","%Name":"inst_5E5580F8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5E5580F8","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":1568.0,},
         {"$GMRInstance":"v4","%Name":"inst_1B2EB59D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1B2EB59D","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":1632.0,},
         {"$GMRInstance":"v4","%Name":"inst_5B37ACEA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5B37ACEA","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":192.0,"y":1632.0,},
         {"$GMRInstance":"v4","%Name":"inst_71C23646","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_71C23646","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":192.0,"y":1568.0,},
@@ -984,7 +986,7 @@
         {"$GMRInstance":"v4","%Name":"inst_462CFAFE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_462CFAFE","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3200.0,"y":736.0,},
         {"$GMRInstance":"v4","%Name":"inst_4443C822","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4443C822","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3200.0,"y":800.0,},
         {"$GMRInstance":"v4","%Name":"inst_304B206","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_304B206","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":1632.0,},
-        {"$GMRInstance":"v4","%Name":"inst_61A089B2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_61A089B2","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":1568.0,},
+        {"$GMRInstance":"v4","%Name":"inst_61A089B2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_61A089B2","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":1568.0,},
         {"$GMRInstance":"v4","%Name":"inst_2827D953","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2827D953","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":1120.0,},
         {"$GMRInstance":"v4","%Name":"inst_50CDDE0F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_50CDDE0F","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":1056.0,},
         {"$GMRInstance":"v4","%Name":"inst_A0311F3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A0311F3","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":992.0,},
@@ -1042,6 +1044,8 @@
         {"$GMRInstance":"v4","%Name":"inst_4F0A848A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4F0A848A","objectId":{"name":"oSlicedApple","path":"objects/oSlicedApple/oSlicedApple.yy",},"properties":[
             {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oParentCollectable","path":"objects/oParentCollectable/oParentCollectable.yy",},"propertyId":{"name":"uuid","path":"objects/oParentCollectable/oParentCollectable.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"rTest_1_sa",},
           ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":320.0,},
+        {"$GMRInstance":"v4","%Name":"inst_18CEEF87","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_18CEEF87","objectId":{"name":"oEnemyFlyingTrack","path":"objects/oEnemyFlyingTrack/oEnemyFlyingTrack.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1600.0,"y":1504.0,},
+        {"$GMRInstance":"v4","%Name":"inst_3DD23708","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3DD23708","objectId":{"name":"oEnemyFlying","path":"objects/oEnemyFlying/oEnemyFlying.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":288.0,"y":800.0,},
       ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,},
     {"$GMRBackgroundLayer":"","%Name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4278190080,"depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Background","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,},
   ],

+ 131 - 33
rooms/rTest_2/rTest_2.yy

@@ -27,7 +27,6 @@
     {"name":"inst_4F3C3519","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_40E70FB2","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_FAC3BD0","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_19EC5C17","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_56A2B5B7","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_5E7DB295","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_39E61530","path":"rooms/rTest_2/rTest_2.yy",},
@@ -39,15 +38,64 @@
     {"name":"inst_E384A36","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_7F0A36F","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_76BE403D","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_1ABEB0D4","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_73318518","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_1DBB8205","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_1E35F125","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_2826FF93","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_564D1DAE","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_27B03676","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_51400F79","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_65F145CC","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_46DB344E","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_7494309E","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_2F685D8C","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_1E6ED4B4","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_6FB9DD9B","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_3B2EB6AC","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_6137953F","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_488A9BC4","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_4FEA3227","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_4161E055","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_29128C7","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_2F13E9BB","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_31820EE4","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_42D3022E","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_65825193","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_33CA4A1F","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_1BC5F2DA","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_693C858A","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_66FC42C3","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_6CAB3E6","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_7D169794","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_54367FA9","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_149644AF","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_74DB72D","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_45549162","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_E892B31","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_358ECA0B","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_3AAA812D","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_2F8EED7","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_1DD1A367","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_1BC1E2","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_5409E19","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_6021AEAC","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_3FD6E44A","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_7483B109","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_29D26FB4","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_1B5CBE5B","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_1CBFEE88","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_3BC62543","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_68D85792","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_29BD5360","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_8083626","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_116D1480","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_23E614AB","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_7E447A91","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_698457D9","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_2E94E80C","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_3901C1A7","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_4E99778E","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_6E887A6C","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_116B582C","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_1BC019CB","path":"rooms/rTest_2/rTest_2.yy",},
   ],
   "isDnd":false,
   "layers":[
@@ -70,40 +118,90 @@
         {"$GMRInstance":"v4","%Name":"inst_47E2CCBB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_47E2CCBB","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3744.0,"y":480.0,},
         {"$GMRInstance":"v4","%Name":"inst_6AA6D3EE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6AA6D3EE","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3744.0,"y":544.0,},
         {"$GMRInstance":"v4","%Name":"inst_30CE28B3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_30CE28B3","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3744.0,"y":608.0,},
-        {"$GMRInstance":"v4","%Name":"inst_21DBBEE3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_21DBBEE3","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3680.0,"y":480.0,},
-        {"$GMRInstance":"v4","%Name":"inst_85DC118","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_85DC118","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3680.0,"y":544.0,},
-        {"$GMRInstance":"v4","%Name":"inst_35212748","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_35212748","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3680.0,"y":608.0,},
-        {"$GMRInstance":"v4","%Name":"inst_3E35C6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3E35C6","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3808.0,"y":1600.0,},
-        {"$GMRInstance":"v4","%Name":"inst_294EFD23","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_294EFD23","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3744.0,"y":1600.0,},
-        {"$GMRInstance":"v4","%Name":"inst_4F3C3519","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4F3C3519","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3424.0,"y":1600.0,},
-        {"$GMRInstance":"v4","%Name":"inst_40E70FB2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_40E70FB2","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3360.0,"y":1600.0,},
-        {"$GMRInstance":"v4","%Name":"inst_FAC3BD0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FAC3BD0","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3296.0,"y":1600.0,},
-        {"$GMRInstance":"v4","%Name":"inst_19EC5C17","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_19EC5C17","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1024.0,},
-        {"$GMRInstance":"v4","%Name":"inst_56A2B5B7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_56A2B5B7","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1472.0,},
-        {"$GMRInstance":"v4","%Name":"inst_5E7DB295","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5E7DB295","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1408.0,},
-        {"$GMRInstance":"v4","%Name":"inst_39E61530","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_39E61530","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1344.0,},
-        {"$GMRInstance":"v4","%Name":"inst_7ED7881C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7ED7881C","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3488.0,"y":1600.0,},
-        {"$GMRInstance":"v4","%Name":"inst_342179D2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_342179D2","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3552.0,"y":1600.0,},
-        {"$GMRInstance":"v4","%Name":"inst_120AD637","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_120AD637","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3616.0,"y":1600.0,},
-        {"$GMRInstance":"v4","%Name":"inst_475B421","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_475B421","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3680.0,"y":1600.0,},
-        {"$GMRInstance":"v4","%Name":"inst_50FA5BBE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_50FA5BBE","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1536.0,},
-        {"$GMRInstance":"v4","%Name":"inst_E384A36","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E384A36","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1280.0,},
-        {"$GMRInstance":"v4","%Name":"inst_7F0A36F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7F0A36F","objectId":{"name":"oSavePoint","path":"objects/oSavePoint/oSavePoint.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3392.0,"y":1568.0,},
-        {"$GMRInstance":"v4","%Name":"inst_76BE403D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_76BE403D","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3232.0,"y":1600.0,},
-        {"$GMRInstance":"v4","%Name":"inst_1ABEB0D4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1ABEB0D4","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1216.0,},
-        {"$GMRInstance":"v4","%Name":"inst_73318518","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_73318518","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1088.0,},
-        {"$GMRInstance":"v4","%Name":"inst_1DBB8205","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1DBB8205","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1600.0,},
-        {"$GMRInstance":"v4","%Name":"inst_1E35F125","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1E35F125","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1152.0,},
+        {"$GMRInstance":"v4","%Name":"inst_21DBBEE3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_21DBBEE3","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3616.0,"y":480.0,},
+        {"$GMRInstance":"v4","%Name":"inst_85DC118","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_85DC118","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3616.0,"y":544.0,},
+        {"$GMRInstance":"v4","%Name":"inst_35212748","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_35212748","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3616.0,"y":608.0,},
+        {"$GMRInstance":"v4","%Name":"inst_3E35C6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3E35C6","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3808.0,"y":1568.0,},
+        {"$GMRInstance":"v4","%Name":"inst_294EFD23","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_294EFD23","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3744.0,"y":1568.0,},
+        {"$GMRInstance":"v4","%Name":"inst_4F3C3519","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4F3C3519","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3424.0,"y":1568.0,},
+        {"$GMRInstance":"v4","%Name":"inst_40E70FB2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_40E70FB2","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3360.0,"y":1568.0,},
+        {"$GMRInstance":"v4","%Name":"inst_FAC3BD0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FAC3BD0","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3296.0,"y":1568.0,},
+        {"$GMRInstance":"v4","%Name":"inst_56A2B5B7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_56A2B5B7","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1440.0,},
+        {"$GMRInstance":"v4","%Name":"inst_5E7DB295","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5E7DB295","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1376.0,},
+        {"$GMRInstance":"v4","%Name":"inst_39E61530","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_39E61530","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1312.0,},
+        {"$GMRInstance":"v4","%Name":"inst_7ED7881C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7ED7881C","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3488.0,"y":1568.0,},
+        {"$GMRInstance":"v4","%Name":"inst_342179D2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_342179D2","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3552.0,"y":1568.0,},
+        {"$GMRInstance":"v4","%Name":"inst_120AD637","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_120AD637","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3616.0,"y":1568.0,},
+        {"$GMRInstance":"v4","%Name":"inst_475B421","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_475B421","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3680.0,"y":1568.0,},
+        {"$GMRInstance":"v4","%Name":"inst_50FA5BBE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_50FA5BBE","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1504.0,},
+        {"$GMRInstance":"v4","%Name":"inst_E384A36","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E384A36","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1248.0,},
+        {"$GMRInstance":"v4","%Name":"inst_7F0A36F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7F0A36F","objectId":{"name":"oSavePoint","path":"objects/oSavePoint/oSavePoint.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3392.0,"y":1536.0,},
+        {"$GMRInstance":"v4","%Name":"inst_76BE403D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_76BE403D","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3232.0,"y":1568.0,},
+        {"$GMRInstance":"v4","%Name":"inst_1DBB8205","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1DBB8205","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1568.0,},
         {"$GMRInstance":"v4","%Name":"inst_2826FF93","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2826FF93","objectId":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},"properties":[
             {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},"propertyId":{"name":"door_id","path":"objects/oDoor/oDoor.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"1",},
             {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},"propertyId":{"name":"target_door_id","path":"objects/oDoor/oDoor.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"1",},
             {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},"propertyId":{"name":"door_direction","path":"objects/oDoor/oDoor.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"LEFT",},
             {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},"propertyId":{"name":"target_room","path":"objects/oDoor/oDoor.yy",},"resource":{"name":"rTest_1","path":"rooms/rTest_1/rTest_1.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"rTest_1",},
-          ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3904.0,"y":1568.0,},
-        {"$GMRInstance":"v4","%Name":"inst_564D1DAE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_564D1DAE","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":1024.0,},
-        {"$GMRInstance":"v4","%Name":"inst_27B03676","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_27B03676","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":1088.0,},
-        {"$GMRInstance":"v4","%Name":"inst_51400F79","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_51400F79","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":1152.0,},
-        {"$GMRInstance":"v4","%Name":"inst_65F145CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_65F145CC","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":1216.0,},
+          ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3904.0,"y":1536.0,},
+        {"$GMRInstance":"v4","%Name":"inst_564D1DAE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_564D1DAE","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":1056.0,},
+        {"$GMRInstance":"v4","%Name":"inst_27B03676","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_27B03676","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":1120.0,},
+        {"$GMRInstance":"v4","%Name":"inst_51400F79","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_51400F79","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":1184.0,},
+        {"$GMRInstance":"v4","%Name":"inst_65F145CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_65F145CC","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":992.0,},
+        {"$GMRInstance":"v4","%Name":"inst_46DB344E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_46DB344E","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1056.0,},
+        {"$GMRInstance":"v4","%Name":"inst_7494309E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7494309E","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":992.0,},
+        {"$GMRInstance":"v4","%Name":"inst_2F685D8C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2F685D8C","objectId":{"name":"oBreakableSolid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"properties":[
+            {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oBreakableSolid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"propertyId":{"name":"uuid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"singleWayDoor1",},
+          ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":90.0,"scaleX":1.0,"scaleY":1.0,"x":3392.0,"y":576.0,},
+        {"$GMRInstance":"v4","%Name":"inst_1E6ED4B4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1E6ED4B4","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":928.0,},
+        {"$GMRInstance":"v4","%Name":"inst_6FB9DD9B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6FB9DD9B","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":864.0,},
+        {"$GMRInstance":"v4","%Name":"inst_3B2EB6AC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3B2EB6AC","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":800.0,},
+        {"$GMRInstance":"v4","%Name":"inst_6137953F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6137953F","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":736.0,},
+        {"$GMRInstance":"v4","%Name":"inst_488A9BC4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_488A9BC4","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":672.0,},
+        {"$GMRInstance":"v4","%Name":"inst_4FEA3227","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4FEA3227","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":608.0,},
+        {"$GMRInstance":"v4","%Name":"inst_4161E055","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4161E055","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":544.0,},
+        {"$GMRInstance":"v4","%Name":"inst_29128C7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_29128C7","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":480.0,},
+        {"$GMRInstance":"v4","%Name":"inst_5409E19","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5409E19","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":480.0,},
+        {"$GMRInstance":"v4","%Name":"inst_6021AEAC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6021AEAC","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":416.0,},
+        {"$GMRInstance":"v4","%Name":"inst_3FD6E44A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3FD6E44A","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":352.0,},
+        {"$GMRInstance":"v4","%Name":"inst_7483B109","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7483B109","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":288.0,},
+        {"$GMRInstance":"v4","%Name":"inst_29D26FB4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_29D26FB4","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":224.0,},
+        {"$GMRInstance":"v4","%Name":"inst_1B5CBE5B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1B5CBE5B","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":160.0,},
+        {"$GMRInstance":"v4","%Name":"inst_1CBFEE88","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1CBFEE88","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":96.0,},
+        {"$GMRInstance":"v4","%Name":"inst_3BC62543","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3BC62543","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":32.0,},
+        {"$GMRInstance":"v4","%Name":"inst_2F13E9BB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2F13E9BB","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1632.0,},
+        {"$GMRInstance":"v4","%Name":"inst_31820EE4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_31820EE4","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3232.0,"y":1632.0,},
+        {"$GMRInstance":"v4","%Name":"inst_42D3022E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_42D3022E","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3296.0,"y":1632.0,},
+        {"$GMRInstance":"v4","%Name":"inst_65825193","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_65825193","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3360.0,"y":1632.0,},
+        {"$GMRInstance":"v4","%Name":"inst_33CA4A1F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_33CA4A1F","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3424.0,"y":1632.0,},
+        {"$GMRInstance":"v4","%Name":"inst_1BC5F2DA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1BC5F2DA","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3488.0,"y":1632.0,},
+        {"$GMRInstance":"v4","%Name":"inst_693C858A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_693C858A","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3552.0,"y":1632.0,},
+        {"$GMRInstance":"v4","%Name":"inst_66FC42C3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_66FC42C3","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3616.0,"y":1632.0,},
+        {"$GMRInstance":"v4","%Name":"inst_6CAB3E6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6CAB3E6","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3680.0,"y":1632.0,},
+        {"$GMRInstance":"v4","%Name":"inst_7D169794","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7D169794","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3744.0,"y":1632.0,},
+        {"$GMRInstance":"v4","%Name":"inst_54367FA9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_54367FA9","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3808.0,"y":1632.0,},
+        {"$GMRInstance":"v4","%Name":"inst_149644AF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_149644AF","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3232.0,"y":608.0,},
+        {"$GMRInstance":"v4","%Name":"inst_74DB72D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_74DB72D","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3232.0,"y":544.0,},
+        {"$GMRInstance":"v4","%Name":"inst_45549162","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_45549162","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3232.0,"y":480.0,},
+        {"$GMRInstance":"v4","%Name":"inst_E892B31","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E892B31","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3552.0,"y":480.0,},
+        {"$GMRInstance":"v4","%Name":"inst_358ECA0B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_358ECA0B","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3552.0,"y":544.0,},
+        {"$GMRInstance":"v4","%Name":"inst_3AAA812D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3AAA812D","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3552.0,"y":608.0,},
+        {"$GMRInstance":"v4","%Name":"inst_2F8EED7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2F8EED7","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3680.0,"y":608.0,},
+        {"$GMRInstance":"v4","%Name":"inst_1DD1A367","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1DD1A367","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3680.0,"y":544.0,},
+        {"$GMRInstance":"v4","%Name":"inst_1BC1E2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1BC1E2","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3680.0,"y":480.0,},
+        {"$GMRInstance":"v4","%Name":"inst_68D85792","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_68D85792","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":992.0,},
+        {"$GMRInstance":"v4","%Name":"inst_29BD5360","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_29BD5360","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":928.0,},
+        {"$GMRInstance":"v4","%Name":"inst_8083626","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8083626","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":864.0,},
+        {"$GMRInstance":"v4","%Name":"inst_116D1480","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_116D1480","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":800.0,},
+        {"$GMRInstance":"v4","%Name":"inst_23E614AB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_23E614AB","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":736.0,},
+        {"$GMRInstance":"v4","%Name":"inst_7E447A91","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7E447A91","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":672.0,},
+        {"$GMRInstance":"v4","%Name":"inst_698457D9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_698457D9","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":608.0,},
+        {"$GMRInstance":"v4","%Name":"inst_2E94E80C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2E94E80C","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":544.0,},
+        {"$GMRInstance":"v4","%Name":"inst_3901C1A7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3901C1A7","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1120.0,},
+        {"$GMRInstance":"v4","%Name":"inst_4E99778E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4E99778E","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1184.0,},
+        {"$GMRInstance":"v4","%Name":"inst_6E887A6C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6E887A6C","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":928.0,},
+        {"$GMRInstance":"v4","%Name":"inst_116B582C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_116B582C","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":864.0,},
+        {"$GMRInstance":"v4","%Name":"inst_1BC019CB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1BC019CB","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":800.0,},
       ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,},
     {"$GMRBackgroundLayer":"","%Name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4278190080,"depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Background","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,},
   ],

+ 2 - 1
scripts/DummyAI/DummyAI.gml

@@ -2,6 +2,7 @@ function enemy_dummy_ai()
 {
 	x_spd = 0;
 	y_spd = 0;
+	
 	switch(state)
 	{
 		case "IDLE":
@@ -10,7 +11,7 @@ function enemy_dummy_ai()
 				state = "COUNTER";
 				set_sprite(sEnemyDummyCounter);
 			}
-			facing = sign(oPlayer.x - x);
+			facing = sign(global.player.x - x);
 			break;
 			
 		case "COUNTER":

+ 0 - 16
scripts/EnemyStates/EnemyStates.gml

@@ -49,22 +49,6 @@ function enemy_check_hitstun()
 	}
 }
 
-function enemy_get_hit(_damage, _kb_x, _kb_y)
-{
-    hp -= _damage;
-    
-    hitstun_timer = hitstun_max;
-
-    x_spd_kb = _kb_x * kb_factor;
-	y_spd_kb = _kb_y * kb_factor;
-
-    if hp <= 0
-	{
-        is_dead = true;
-        instance_destroy();
-    }
-}
-
 /// @desc 优雅地以该实例为原点,给定宽高、偏移与持续时间为参数,生成敌人middle/left碰撞箱(多用于攻击)
 /// @param {real} _x 碰撞箱宽度
 /// @param {real} _y 碰撞箱高度

+ 15 - 42
scripts/FlyingAI/FlyingAI.gml

@@ -1,48 +1,21 @@
 function enemy_flying_ai()
 {
-	// 索敌
-    var _target = noone;
-    if instance_exists(oPlayer)
-        if distance_to_object(oPlayer) < chase_range
-            _target = oPlayer;
-
-    // 行为逻辑
-    if _target != noone
+	x_spd = facing * x_base_spd;
+	y_spd = facing_y * y_base_spd;
+	
+    if place_meeting(x, y + y_spd, oParentSolid)
     {
-        state = "CHASE";
-        var _dir = point_direction(x, y, _target.x, _target.y);
-        
-        // 施加加速度
-        x_spd += lengthdir_x(accel, _dir) * global.time_scale;
-        y_spd += lengthdir_y(accel, _dir) * global.time_scale;
-        
-        // 面向处理
-        facing = (x < _target.x) ? 1 : -1;
-    } 
-    else 
-    {
-        state = "IDLE";
-        var _dist_to_spawn = point_distance(x, y, spawn_x, spawn_y);
-        
-        if (_dist_to_spawn > 5) {
-            var _dir_home = point_direction(x, y, spawn_x, spawn_y);
-            x_spd += lengthdir_x(accel * 0.5, _dir_home) * global.time_scale;
-            y_spd += lengthdir_y(accel * 0.5, _dir_home) * global.time_scale;
-        } else {
-            // 接近出生点时,应用空气阻力让它停下
-            x_spd = lerp(x_spd, 0, air_friction);
-            y_spd = lerp(y_spd, 0, air_friction);
-        }
+        while !place_meeting(x, y + sign(y_spd), oParentSolid)
+            y += sign(y_spd);
+			
+		facing_y = -facing_y;
     }
-
-    // 3. 速度限制 (Clamp)
-    var _current_spd = point_distance(0, 0, x_spd, y_spd);
-    if (_current_spd > max_spd) {
-        var _scale = max_spd / _current_spd;
-        x_spd *= _scale;
-        y_spd *= _scale;
+    if place_meeting(x + x_spd, y, oParentSolid)
+    {
+        while !place_meeting(x + sign(x_spd), y, oParentSolid)
+            x += sign(x_spd);
+	
+		facing = -facing;
     }
-    
-    // 4. 动画更新 (之前讨论的手动控制)
-    set_sprite(sEnemyFlying_Fly);
+    set_sprite(sEnemyFlying);
 }

+ 45 - 0
scripts/FlyingTrackAI/FlyingTrackAI.gml

@@ -0,0 +1,45 @@
+function enemy_flying_track_ai()
+{	
+    var _target = noone;
+    if instance_exists(global.player)
+	{
+		var _blocker = collision_line(x, y,
+		global.player.x, global.player.y - 1, oParentSolid, false, true);
+		
+        if distance_to_object(global.player) < range && _blocker == noone
+            _target = global.player;
+	}
+
+    if _target != noone
+    {
+        var _dir = point_direction(x, y, _target.x, _target.y - 128);
+        
+        x_spd += lengthdir_x(acc, _dir);
+        y_spd += lengthdir_y(acc, _dir);
+        
+        facing = sign(_target.x - x);
+		
+		set_sprite(sEnemyFlyingTrack);
+    }
+	else
+	{
+		if y_spd = 0
+		{
+			x_spd = 0;
+			set_sprite(sEnemyFlyingTrackIdle);
+		}
+		
+		x_spd = lerp(x_spd, 0, 0.01);
+		y_spd += acc;
+	}
+
+    var _current_spd = point_distance(0, 0, x_spd, y_spd);
+    if _current_spd > max_spd
+	{
+        var _scale = max_spd / _current_spd;
+        x_spd *= _scale;
+        y_spd *= _scale;
+    }
+	
+	image_xscale = facing;
+}

+ 13 - 0
scripts/FlyingTrackAI/FlyingTrackAI.yy

@@ -0,0 +1,13 @@
+{
+  "$GMScript":"v1",
+  "%Name":"FlyingTrackAI",
+  "isCompatibility":false,
+  "isDnD":false,
+  "name":"FlyingTrackAI",
+  "parent":{
+    "name":"oEnemyFlyingTrack",
+    "path":"folders/Enemy/oEnemyFlyingTrack.yy",
+  },
+  "resourceType":"GMScript",
+  "resourceVersion":"2.0",
+}

+ 3 - 3
scripts/PlayerStates/PlayerStates.gml

@@ -452,11 +452,11 @@ function state_attack()
 		}
 		else
 		{
-			current_hb = icl(oPlayerHitboxHor, x + 72 * facing, y - 64);
-			current_hb.x_offset += 72 * facing;
+			current_hb = icl(oPlayerHitboxHor, x, y - 64);
+			current_hb.image_xscale = facing;
 			current_hb.y_offset = -64;
 			
-			current_hb.kb_factor_x *= facing;
+			current_hb.hit_info.kbFactorX *= facing;
 		}
 		current_hb.owner = id;
 	}

+ 40 - 0
scripts/general/general.gml

@@ -43,4 +43,44 @@ function screen_shake(_magnitude)//, _duration)
             //shake_duration = _duration;
         }
     }
+}
+
+function self_check_destroy()
+{
+	if struct_exists(global.save_data.world.destroyed_objects, uuid)
+		instance_destroy();
+}
+function self_record_destroy(_callback = undefined)
+{
+	var _list = global.save_data.world.destroyed_objects;
+
+	_list[$ uuid] = true;
+
+	if is_method(_callback)
+		_callback();
+
+	save_game_to_disk();
+
+	instance_destroy();
+}
+
+function player_add_INK(_amount)
+{
+	if global.playerINK + _amount >
+	global.save_data.player.maxINK
+	
+		global.playerINK = global.save_data.player.maxINK;
+	
+	else
+		global.playerINK += _amount;
+}
+function player_add_HP(_amount)
+{
+	if global.playerHP + _amount >
+	global.save_data.player.maxHP
+	
+		global.playerHP = global.save_data.player.maxHP;
+	
+	else
+		global.playerHP += _amount;
 }

BIN
sprites/sBreakableSolid/5f8a516f-8580-4fa8-8b91-351f5998c6db.png


BIN
sprites/sBreakableSolid/88bb7138-ade4-44c5-bc2f-2291c403a678.png


BIN
sprites/sBreakableSolid/8f2bb299-97ae-4e5b-abc4-4fb1af6caacb.png


BIN
sprites/sBreakableSolid/b85b8ab1-6666-4562-9116-ba90cd3680d1.png


BIN
sprites/sBreakableSolid/layers/5f8a516f-8580-4fa8-8b91-351f5998c6db/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png


BIN
sprites/sBreakableSolid/layers/88bb7138-ade4-44c5-bc2f-2291c403a678/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png


BIN
sprites/sBreakableSolid/layers/8f2bb299-97ae-4e5b-abc4-4fb1af6caacb/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png


BIN
sprites/sBreakableSolid/layers/b85b8ab1-6666-4562-9116-ba90cd3680d1/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png


+ 102 - 0
sprites/sBreakableSolid/sBreakableSolid.yy

@@ -0,0 +1,102 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sBreakableSolid",
+  "bboxMode":0,
+  "bbox_bottom":255,
+  "bbox_left":0,
+  "bbox_right":127,
+  "bbox_top":0,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"5f8a516f-8580-4fa8-8b91-351f5998c6db","name":"5f8a516f-8580-4fa8-8b91-351f5998c6db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"8f2bb299-97ae-4e5b-abc4-4fb1af6caacb","name":"8f2bb299-97ae-4e5b-abc4-4fb1af6caacb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"88bb7138-ade4-44c5-bc2f-2291c403a678","name":"88bb7138-ade4-44c5-bc2f-2291c403a678","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"b85b8ab1-6666-4562-9116-ba90cd3680d1","name":"b85b8ab1-6666-4562-9116-ba90cd3680d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":256,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"dc2c122c-d732-48ba-a0d9-baf2160c52f5","blendMode":0,"displayName":"default","isLocked":false,"name":"dc2c122c-d732-48ba-a0d9-baf2160c52f5","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sBreakableSolid",
+  "nineSlice":null,
+  "origin":4,
+  "parent":{
+    "name":"SolidObjects",
+    "path":"folders/StationaryObjects/SolidObjects.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sBreakableSolid",
+    "autoRecord":true,
+    "backdropHeight":768,
+    "backdropImageOpacity":0.5,
+    "backdropImagePath":"",
+    "backdropWidth":1366,
+    "backdropXOffset":0.0,
+    "backdropYOffset":0.0,
+    "events":{
+      "$KeyframeStore<MessageEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MessageEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "eventStubScript":null,
+    "eventToFunction":{},
+    "length":4.0,
+    "lockOrigin":false,
+    "moments":{
+      "$KeyframeStore<MomentsEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MomentsEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "name":"sBreakableSolid",
+    "playback":1,
+    "playbackSpeed":30.0,
+    "playbackSpeedType":0,
+    "resourceType":"GMSequence",
+    "resourceVersion":"2.0",
+    "showBackdrop":true,
+    "showBackdropImage":false,
+    "timeUnits":1,
+    "tracks":[
+      {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore<SpriteFrameKeyframe>":"","Keyframes":[
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f8a516f-8580-4fa8-8b91-351f5998c6db","path":"sprites/sBreakableSolid/sBreakableSolid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"dd13c378-d9e8-4761-84d8-732934eb44b7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f2bb299-97ae-4e5b-abc4-4fb1af6caacb","path":"sprites/sBreakableSolid/sBreakableSolid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"8ac98009-419e-4385-a3c7-4e0bfbcf55b2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88bb7138-ade4-44c5-bc2f-2291c403a678","path":"sprites/sBreakableSolid/sBreakableSolid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"05dee425-530d-4597-95c7-22d823d92b55","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b85b8ab1-6666-4562-9116-ba90cd3680d1","path":"sprites/sBreakableSolid/sBreakableSolid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"94bad656-1bc1-4384-8f40-23209185a307","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+          ],"resourceType":"KeyframeStore<SpriteFrameKeyframe>","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,},
+    ],
+    "visibleRange":null,
+    "volume":1.0,
+    "xorigin":64,
+    "yorigin":128,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":128,
+}

BIN
sprites/sEnemyFlying/313d19ac-423c-4585-89d5-d727c8a6382e.png


BIN
sprites/sEnemyFlying/4ed8f73b-89af-4d0c-b10b-18e16e3b7922.png


BIN
sprites/sEnemyFlying/7370f7a0-03b4-4707-a9fe-e4fee021830a.png


BIN
sprites/sEnemyFlying/7e0df1f3-28dc-45fa-b317-e7900ffb70e0.png


BIN
sprites/sEnemyFlyingTrack/313d19ac-423c-4585-89d5-d727c8a6382e.png


BIN
sprites/sEnemyFlyingTrack/4ed8f73b-89af-4d0c-b10b-18e16e3b7922.png


BIN
sprites/sEnemyFlyingTrack/7370f7a0-03b4-4707-a9fe-e4fee021830a.png


BIN
sprites/sEnemyFlyingTrack/7e0df1f3-28dc-45fa-b317-e7900ffb70e0.png


BIN
sprites/sEnemyFlyingTrack/layers/313d19ac-423c-4585-89d5-d727c8a6382e/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png


BIN
sprites/sEnemyFlyingTrack/layers/4ed8f73b-89af-4d0c-b10b-18e16e3b7922/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png


BIN
sprites/sEnemyFlyingTrack/layers/7370f7a0-03b4-4707-a9fe-e4fee021830a/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png


BIN
sprites/sEnemyFlyingTrack/layers/7e0df1f3-28dc-45fa-b317-e7900ffb70e0/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png


+ 102 - 0
sprites/sEnemyFlyingTrack/sEnemyFlyingTrack.yy

@@ -0,0 +1,102 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sEnemyFlyingTrack",
+  "bboxMode":0,
+  "bbox_bottom":63,
+  "bbox_left":0,
+  "bbox_right":63,
+  "bbox_top":0,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"313d19ac-423c-4585-89d5-d727c8a6382e","name":"313d19ac-423c-4585-89d5-d727c8a6382e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"7e0df1f3-28dc-45fa-b317-e7900ffb70e0","name":"7e0df1f3-28dc-45fa-b317-e7900ffb70e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"4ed8f73b-89af-4d0c-b10b-18e16e3b7922","name":"4ed8f73b-89af-4d0c-b10b-18e16e3b7922","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"7370f7a0-03b4-4707-a9fe-e4fee021830a","name":"7370f7a0-03b4-4707-a9fe-e4fee021830a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":64,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"6b9701e4-db4a-44cb-947f-7ef6e92e0c3e","blendMode":0,"displayName":"default","isLocked":false,"name":"6b9701e4-db4a-44cb-947f-7ef6e92e0c3e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sEnemyFlyingTrack",
+  "nineSlice":null,
+  "origin":4,
+  "parent":{
+    "name":"oEnemyFlyingTrack",
+    "path":"folders/Enemy/oEnemyFlyingTrack.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sEnemyFlyingTrack",
+    "autoRecord":true,
+    "backdropHeight":768,
+    "backdropImageOpacity":0.5,
+    "backdropImagePath":"",
+    "backdropWidth":1366,
+    "backdropXOffset":0.0,
+    "backdropYOffset":0.0,
+    "events":{
+      "$KeyframeStore<MessageEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MessageEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "eventStubScript":null,
+    "eventToFunction":{},
+    "length":4.0,
+    "lockOrigin":false,
+    "moments":{
+      "$KeyframeStore<MomentsEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MomentsEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "name":"sEnemyFlyingTrack",
+    "playback":1,
+    "playbackSpeed":30.0,
+    "playbackSpeedType":0,
+    "resourceType":"GMSequence",
+    "resourceVersion":"2.0",
+    "showBackdrop":true,
+    "showBackdropImage":false,
+    "timeUnits":1,
+    "tracks":[
+      {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore<SpriteFrameKeyframe>":"","Keyframes":[
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"313d19ac-423c-4585-89d5-d727c8a6382e","path":"sprites/sEnemyFlyingTrack/sEnemyFlyingTrack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"803bc476-ea8e-4da5-bd78-635ef15618c1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e0df1f3-28dc-45fa-b317-e7900ffb70e0","path":"sprites/sEnemyFlyingTrack/sEnemyFlyingTrack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"a56d7805-8e3c-4ddc-827a-4a53ba9dd626","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ed8f73b-89af-4d0c-b10b-18e16e3b7922","path":"sprites/sEnemyFlyingTrack/sEnemyFlyingTrack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"80046e38-f0db-4423-95b2-c1176358e351","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7370f7a0-03b4-4707-a9fe-e4fee021830a","path":"sprites/sEnemyFlyingTrack/sEnemyFlyingTrack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"1baf405d-f9e3-4f79-8150-102bd12b9988","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+          ],"resourceType":"KeyframeStore<SpriteFrameKeyframe>","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,},
+    ],
+    "visibleRange":null,
+    "volume":1.0,
+    "xorigin":32,
+    "yorigin":32,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":64,
+}

BIN
sprites/sEnemyFlyingTrackIdle/313d19ac-423c-4585-89d5-d727c8a6382e.png


BIN
sprites/sEnemyFlyingTrackIdle/4ed8f73b-89af-4d0c-b10b-18e16e3b7922.png


BIN
sprites/sEnemyFlyingTrackIdle/7370f7a0-03b4-4707-a9fe-e4fee021830a.png


BIN
sprites/sEnemyFlyingTrackIdle/7e0df1f3-28dc-45fa-b317-e7900ffb70e0.png


BIN
sprites/sEnemyFlyingTrackIdle/layers/313d19ac-423c-4585-89d5-d727c8a6382e/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png


BIN
sprites/sEnemyFlyingTrackIdle/layers/4ed8f73b-89af-4d0c-b10b-18e16e3b7922/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png


BIN
sprites/sEnemyFlyingTrackIdle/layers/7370f7a0-03b4-4707-a9fe-e4fee021830a/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png


BIN
sprites/sEnemyFlyingTrackIdle/layers/7e0df1f3-28dc-45fa-b317-e7900ffb70e0/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png


+ 102 - 0
sprites/sEnemyFlyingTrackIdle/sEnemyFlyingTrackIdle.yy

@@ -0,0 +1,102 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sEnemyFlyingTrackIdle",
+  "bboxMode":0,
+  "bbox_bottom":63,
+  "bbox_left":0,
+  "bbox_right":63,
+  "bbox_top":0,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"313d19ac-423c-4585-89d5-d727c8a6382e","name":"313d19ac-423c-4585-89d5-d727c8a6382e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"7e0df1f3-28dc-45fa-b317-e7900ffb70e0","name":"7e0df1f3-28dc-45fa-b317-e7900ffb70e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"4ed8f73b-89af-4d0c-b10b-18e16e3b7922","name":"4ed8f73b-89af-4d0c-b10b-18e16e3b7922","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"7370f7a0-03b4-4707-a9fe-e4fee021830a","name":"7370f7a0-03b4-4707-a9fe-e4fee021830a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":64,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"6b9701e4-db4a-44cb-947f-7ef6e92e0c3e","blendMode":0,"displayName":"default","isLocked":false,"name":"6b9701e4-db4a-44cb-947f-7ef6e92e0c3e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sEnemyFlyingTrackIdle",
+  "nineSlice":null,
+  "origin":4,
+  "parent":{
+    "name":"oEnemyFlyingTrack",
+    "path":"folders/Enemy/oEnemyFlyingTrack.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sEnemyFlyingTrackIdle",
+    "autoRecord":true,
+    "backdropHeight":768,
+    "backdropImageOpacity":0.5,
+    "backdropImagePath":"",
+    "backdropWidth":1366,
+    "backdropXOffset":0.0,
+    "backdropYOffset":0.0,
+    "events":{
+      "$KeyframeStore<MessageEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MessageEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "eventStubScript":null,
+    "eventToFunction":{},
+    "length":4.0,
+    "lockOrigin":false,
+    "moments":{
+      "$KeyframeStore<MomentsEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MomentsEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "name":"sEnemyFlyingTrackIdle",
+    "playback":1,
+    "playbackSpeed":30.0,
+    "playbackSpeedType":0,
+    "resourceType":"GMSequence",
+    "resourceVersion":"2.0",
+    "showBackdrop":true,
+    "showBackdropImage":false,
+    "timeUnits":1,
+    "tracks":[
+      {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore<SpriteFrameKeyframe>":"","Keyframes":[
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"313d19ac-423c-4585-89d5-d727c8a6382e","path":"sprites/sEnemyFlyingTrackIdle/sEnemyFlyingTrackIdle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"803bc476-ea8e-4da5-bd78-635ef15618c1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e0df1f3-28dc-45fa-b317-e7900ffb70e0","path":"sprites/sEnemyFlyingTrackIdle/sEnemyFlyingTrackIdle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"a56d7805-8e3c-4ddc-827a-4a53ba9dd626","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ed8f73b-89af-4d0c-b10b-18e16e3b7922","path":"sprites/sEnemyFlyingTrackIdle/sEnemyFlyingTrackIdle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"80046e38-f0db-4423-95b2-c1176358e351","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7370f7a0-03b4-4707-a9fe-e4fee021830a","path":"sprites/sEnemyFlyingTrackIdle/sEnemyFlyingTrackIdle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"1baf405d-f9e3-4f79-8150-102bd12b9988","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+          ],"resourceType":"KeyframeStore<SpriteFrameKeyframe>","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,},
+    ],
+    "visibleRange":null,
+    "volume":1.0,
+    "xorigin":32,
+    "yorigin":32,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":64,
+}

BIN
sprites/sHitboxDown/1218c0f1-724c-4ab3-94fd-98b4d8d18aba.png


BIN
sprites/sHitboxDown/layers/1218c0f1-724c-4ab3-94fd-98b4d8d18aba/697040fe-66b1-4c20-9282-88683dd20e44.png


+ 90 - 0
sprites/sHitboxDown/sHitboxDown.yy

@@ -0,0 +1,90 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sHitboxDown",
+  "bboxMode":0,
+  "bbox_bottom":143,
+  "bbox_left":0,
+  "bbox_right":71,
+  "bbox_top":0,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"1218c0f1-724c-4ab3-94fd-98b4d8d18aba","name":"1218c0f1-724c-4ab3-94fd-98b4d8d18aba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":144,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"697040fe-66b1-4c20-9282-88683dd20e44","blendMode":0,"displayName":"default","isLocked":false,"name":"697040fe-66b1-4c20-9282-88683dd20e44","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sHitboxDown",
+  "nineSlice":null,
+  "origin":1,
+  "parent":{
+    "name":"UIsprite",
+    "path":"folders/UIsprite.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sHitboxDown",
+    "autoRecord":true,
+    "backdropHeight":768,
+    "backdropImageOpacity":0.5,
+    "backdropImagePath":"",
+    "backdropWidth":1366,
+    "backdropXOffset":0.0,
+    "backdropYOffset":0.0,
+    "events":{
+      "$KeyframeStore<MessageEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MessageEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "eventStubScript":null,
+    "eventToFunction":{},
+    "length":1.0,
+    "lockOrigin":false,
+    "moments":{
+      "$KeyframeStore<MomentsEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MomentsEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "name":"sHitboxDown",
+    "playback":1,
+    "playbackSpeed":0.0,
+    "playbackSpeedType":0,
+    "resourceType":"GMSequence",
+    "resourceVersion":"2.0",
+    "showBackdrop":true,
+    "showBackdropImage":false,
+    "timeUnits":1,
+    "tracks":[
+      {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore<SpriteFrameKeyframe>":"","Keyframes":[
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1218c0f1-724c-4ab3-94fd-98b4d8d18aba","path":"sprites/sHitboxDown/sHitboxDown.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"5a775b81-534b-4082-b351-9b23dbf1f88a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+          ],"resourceType":"KeyframeStore<SpriteFrameKeyframe>","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,},
+    ],
+    "visibleRange":null,
+    "volume":1.0,
+    "xorigin":36,
+    "yorigin":0,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":72,
+}

+ 2 - 2
sprites/sHitboxHor/sHitboxHor.yy

@@ -23,7 +23,7 @@
   ],
   "name":"sHitboxHor",
   "nineSlice":null,
-  "origin":4,
+  "origin":3,
   "parent":{
     "name":"UIsprite",
     "path":"folders/UIsprite.yy",
@@ -75,7 +75,7 @@
     ],
     "visibleRange":null,
     "volume":1.0,
-    "xorigin":72,
+    "xorigin":0,
     "yorigin":48,
   },
   "swatchColours":null,

BIN
sprites/sHitboxUp/1218c0f1-724c-4ab3-94fd-98b4d8d18aba.png


BIN
sprites/sHitboxUp/layers/1218c0f1-724c-4ab3-94fd-98b4d8d18aba/697040fe-66b1-4c20-9282-88683dd20e44.png


+ 9 - 9
sprites/sHitboxVer/sHitboxVer.yy → sprites/sHitboxUp/sHitboxUp.yy

@@ -1,8 +1,8 @@
 {
   "$GMSprite":"v2",
-  "%Name":"sHitboxVer",
+  "%Name":"sHitboxUp",
   "bboxMode":0,
-  "bbox_bottom":223,
+  "bbox_bottom":143,
   "bbox_left":0,
   "bbox_right":71,
   "bbox_top":0,
@@ -16,14 +16,14 @@
   ],
   "gridX":0,
   "gridY":0,
-  "height":224,
+  "height":144,
   "HTile":false,
   "layers":[
     {"$GMImageLayer":"","%Name":"697040fe-66b1-4c20-9282-88683dd20e44","blendMode":0,"displayName":"default","isLocked":false,"name":"697040fe-66b1-4c20-9282-88683dd20e44","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
   ],
-  "name":"sHitboxVer",
+  "name":"sHitboxUp",
   "nineSlice":null,
-  "origin":4,
+  "origin":7,
   "parent":{
     "name":"UIsprite",
     "path":"folders/UIsprite.yy",
@@ -33,7 +33,7 @@
   "resourceVersion":"2.0",
   "sequence":{
     "$GMSequence":"v1",
-    "%Name":"sHitboxVer",
+    "%Name":"sHitboxUp",
     "autoRecord":true,
     "backdropHeight":768,
     "backdropImageOpacity":0.5,
@@ -57,7 +57,7 @@
       "resourceType":"KeyframeStore<MomentsEventKeyframe>",
       "resourceVersion":"2.0",
     },
-    "name":"sHitboxVer",
+    "name":"sHitboxUp",
     "playback":1,
     "playbackSpeed":0.0,
     "playbackSpeedType":0,
@@ -69,14 +69,14 @@
     "tracks":[
       {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore<SpriteFrameKeyframe>":"","Keyframes":[
             {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
-                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1218c0f1-724c-4ab3-94fd-98b4d8d18aba","path":"sprites/sHitboxVer/sHitboxVer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1218c0f1-724c-4ab3-94fd-98b4d8d18aba","path":"sprites/sHitboxUp/sHitboxUp.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
               },"Disabled":false,"id":"5a775b81-534b-4082-b351-9b23dbf1f88a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
           ],"resourceType":"KeyframeStore<SpriteFrameKeyframe>","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,},
     ],
     "visibleRange":null,
     "volume":1.0,
     "xorigin":36,
-    "yorigin":112,
+    "yorigin":144,
   },
   "swatchColours":null,
   "swfPrecision":0.5,

BIN
sprites/sHitboxVer/1218c0f1-724c-4ab3-94fd-98b4d8d18aba.png


BIN
sprites/sHitboxVer/layers/1218c0f1-724c-4ab3-94fd-98b4d8d18aba/697040fe-66b1-4c20-9282-88683dd20e44.png