Răsfoiți Sursa

准备宿舍地图boss中

DrDuck0117 3 săptămâni în urmă
părinte
comite
8a0ca54ba8
100 a modificat fișierele cu 1638 adăugiri și 46 ștergeri
  1. 27 1
      ddmyx.yyp
  2. 1 1
      objects/oAttackInteractive/Create_0.gml
  3. 2 2
      objects/oAttackInteractive/oAttackInteractive.yy
  4. 27 0
      objects/oBossShowerhead/Create_0.gml
  5. 41 0
      objects/oBossShowerhead/oBossShowerhead.yy
  6. 18 0
      objects/oEnemyShowerhead/Create_0.gml
  7. 41 0
      objects/oEnemyShowerhead/oEnemyShowerhead.yy
  8. 1 0
      objects/oParentEnemy/Create_0.gml
  9. 1 1
      objects/oParentEnemy/Draw_0.gml
  10. 4 1
      objects/oPlayerCorpse/oPlayerCorpse.yy
  11. 12 0
      objects/oShowerheadBomb/Create_0.gml
  12. 41 0
      objects/oShowerheadBomb/oShowerheadBomb.yy
  13. 4 4
      rooms/rTest1/rTest1.yy
  14. 2 2
      rooms/rTest2/rTest2.yy
  15. 2 2
      rooms/rTest3/rTest3.yy
  16. 5 5
      rooms/rTest4/rTest4.yy
  17. 1 0
      rooms/rTest5/RoomCreationCode.gml
  18. 82 0
      rooms/rTest5/rTest5.yy
  19. 1 0
      rooms/rTest7/RoomCreationCode.gml
  20. 75 0
      rooms/rTest7/rTest7.yy
  21. 102 0
      scripts/BossShowerheadAI/BossShowerheadAI.gml
  22. 13 0
      scripts/BossShowerheadAI/BossShowerheadAI.yy
  23. 12 27
      scripts/EnemyStates/EnemyStates.gml
  24. 82 0
      scripts/ShowerheadAI/ShowerheadAI.gml
  25. 13 0
      scripts/ShowerheadAI/ShowerheadAI.yy
  26. 31 0
      scripts/enemyShowerheadbombAI/enemyShowerheadbombAI.gml
  27. 13 0
      scripts/enemyShowerheadbombAI/enemyShowerheadbombAI.yy
  28. BIN
      sprites/sBossShowerheadCharge/05716c78-1f90-40a4-bc59-d15f2c7271cd.png
  29. BIN
      sprites/sBossShowerheadCharge/781bd6bb-8b60-4027-98da-ef3e79aef945.png
  30. BIN
      sprites/sBossShowerheadCharge/8258407d-a704-4d90-b699-60dd7f6886bc.png
  31. BIN
      sprites/sBossShowerheadCharge/layers/05716c78-1f90-40a4-bc59-d15f2c7271cd/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  32. BIN
      sprites/sBossShowerheadCharge/layers/781bd6bb-8b60-4027-98da-ef3e79aef945/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  33. BIN
      sprites/sBossShowerheadCharge/layers/8258407d-a704-4d90-b699-60dd7f6886bc/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  34. 98 0
      sprites/sBossShowerheadCharge/sBossShowerheadCharge.yy
  35. BIN
      sprites/sBossShowerheadIdle/05716c78-1f90-40a4-bc59-d15f2c7271cd.png
  36. BIN
      sprites/sBossShowerheadIdle/layers/05716c78-1f90-40a4-bc59-d15f2c7271cd/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  37. 90 0
      sprites/sBossShowerheadIdle/sBossShowerheadIdle.yy
  38. BIN
      sprites/sBossShowerheadRetreat/05716c78-1f90-40a4-bc59-d15f2c7271cd.png
  39. BIN
      sprites/sBossShowerheadRetreat/layers/05716c78-1f90-40a4-bc59-d15f2c7271cd/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  40. 90 0
      sprites/sBossShowerheadRetreat/sBossShowerheadRetreat.yy
  41. BIN
      sprites/sBossShowerheadShoot/05716c78-1f90-40a4-bc59-d15f2c7271cd.png
  42. BIN
      sprites/sBossShowerheadShoot/21385170-a800-4ce3-b734-c2d1ef2963ad.png
  43. BIN
      sprites/sBossShowerheadShoot/3409e7ce-f0e3-4ddf-9afe-b98070d88418.png
  44. BIN
      sprites/sBossShowerheadShoot/55bd6677-5da9-4f79-9be1-a01e096518cb.png
  45. BIN
      sprites/sBossShowerheadShoot/7412f23b-2103-4a8a-be57-ea17a6de89e6.png
  46. BIN
      sprites/sBossShowerheadShoot/7c81463d-38df-4605-bc3a-71a3d10590b3.png
  47. BIN
      sprites/sBossShowerheadShoot/9f690533-9c05-411b-96e3-7c3d830f529d.png
  48. BIN
      sprites/sBossShowerheadShoot/ab536ce0-4c69-403a-86fe-8db67e1c7af4.png
  49. BIN
      sprites/sBossShowerheadShoot/c86c8d20-040d-4456-b475-36de0bd33a3a.png
  50. BIN
      sprites/sBossShowerheadShoot/cd688d98-6cbb-4360-9ae3-82ffc614546d.png
  51. BIN
      sprites/sBossShowerheadShoot/layers/05716c78-1f90-40a4-bc59-d15f2c7271cd/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  52. BIN
      sprites/sBossShowerheadShoot/layers/21385170-a800-4ce3-b734-c2d1ef2963ad/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  53. BIN
      sprites/sBossShowerheadShoot/layers/3409e7ce-f0e3-4ddf-9afe-b98070d88418/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  54. BIN
      sprites/sBossShowerheadShoot/layers/55bd6677-5da9-4f79-9be1-a01e096518cb/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  55. BIN
      sprites/sBossShowerheadShoot/layers/7412f23b-2103-4a8a-be57-ea17a6de89e6/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  56. BIN
      sprites/sBossShowerheadShoot/layers/7c81463d-38df-4605-bc3a-71a3d10590b3/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  57. BIN
      sprites/sBossShowerheadShoot/layers/9f690533-9c05-411b-96e3-7c3d830f529d/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  58. BIN
      sprites/sBossShowerheadShoot/layers/ab536ce0-4c69-403a-86fe-8db67e1c7af4/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  59. BIN
      sprites/sBossShowerheadShoot/layers/c86c8d20-040d-4456-b475-36de0bd33a3a/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  60. BIN
      sprites/sBossShowerheadShoot/layers/cd688d98-6cbb-4360-9ae3-82ffc614546d/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  61. 126 0
      sprites/sBossShowerheadShoot/sBossShowerheadShoot.yy
  62. BIN
      sprites/sBossShowerheadSlam/05716c78-1f90-40a4-bc59-d15f2c7271cd.png
  63. BIN
      sprites/sBossShowerheadSlam/layers/05716c78-1f90-40a4-bc59-d15f2c7271cd/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  64. 90 0
      sprites/sBossShowerheadSlam/sBossShowerheadSlam.yy
  65. BIN
      sprites/sBossShowerheadWindup/05716c78-1f90-40a4-bc59-d15f2c7271cd.png
  66. BIN
      sprites/sBossShowerheadWindup/layers/05716c78-1f90-40a4-bc59-d15f2c7271cd/f24b423d-90db-4b9e-8790-8dafbebd16f4.png
  67. 90 0
      sprites/sBossShowerheadWindup/sBossShowerheadWindup.yy
  68. BIN
      sprites/sEnemyShowerheadCharge/313d19ac-423c-4585-89d5-d727c8a6382e.png
  69. BIN
      sprites/sEnemyShowerheadCharge/4ed8f73b-89af-4d0c-b10b-18e16e3b7922.png
  70. BIN
      sprites/sEnemyShowerheadCharge/7e0df1f3-28dc-45fa-b317-e7900ffb70e0.png
  71. BIN
      sprites/sEnemyShowerheadCharge/layers/313d19ac-423c-4585-89d5-d727c8a6382e/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  72. BIN
      sprites/sEnemyShowerheadCharge/layers/4ed8f73b-89af-4d0c-b10b-18e16e3b7922/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  73. BIN
      sprites/sEnemyShowerheadCharge/layers/7e0df1f3-28dc-45fa-b317-e7900ffb70e0/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  74. 98 0
      sprites/sEnemyShowerheadCharge/sEnemyShowerheadCharge.yy
  75. BIN
      sprites/sEnemyShowerheadEmerge/313d19ac-423c-4585-89d5-d727c8a6382e.png
  76. BIN
      sprites/sEnemyShowerheadEmerge/4ed8f73b-89af-4d0c-b10b-18e16e3b7922.png
  77. BIN
      sprites/sEnemyShowerheadEmerge/697d4062-25fd-4243-b315-0ac1140fd0b4.png
  78. BIN
      sprites/sEnemyShowerheadEmerge/7370f7a0-03b4-4707-a9fe-e4fee021830a.png
  79. BIN
      sprites/sEnemyShowerheadEmerge/7e0df1f3-28dc-45fa-b317-e7900ffb70e0.png
  80. BIN
      sprites/sEnemyShowerheadEmerge/layers/313d19ac-423c-4585-89d5-d727c8a6382e/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  81. BIN
      sprites/sEnemyShowerheadEmerge/layers/4ed8f73b-89af-4d0c-b10b-18e16e3b7922/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  82. BIN
      sprites/sEnemyShowerheadEmerge/layers/697d4062-25fd-4243-b315-0ac1140fd0b4/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  83. BIN
      sprites/sEnemyShowerheadEmerge/layers/7370f7a0-03b4-4707-a9fe-e4fee021830a/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  84. BIN
      sprites/sEnemyShowerheadEmerge/layers/7e0df1f3-28dc-45fa-b317-e7900ffb70e0/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  85. 106 0
      sprites/sEnemyShowerheadEmerge/sEnemyShowerheadEmerge.yy
  86. BIN
      sprites/sEnemyShowerheadIdle/313d19ac-423c-4585-89d5-d727c8a6382e.png
  87. BIN
      sprites/sEnemyShowerheadIdle/4ed8f73b-89af-4d0c-b10b-18e16e3b7922.png
  88. BIN
      sprites/sEnemyShowerheadIdle/7370f7a0-03b4-4707-a9fe-e4fee021830a.png
  89. BIN
      sprites/sEnemyShowerheadIdle/7e0df1f3-28dc-45fa-b317-e7900ffb70e0.png
  90. BIN
      sprites/sEnemyShowerheadIdle/layers/313d19ac-423c-4585-89d5-d727c8a6382e/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  91. BIN
      sprites/sEnemyShowerheadIdle/layers/4ed8f73b-89af-4d0c-b10b-18e16e3b7922/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  92. BIN
      sprites/sEnemyShowerheadIdle/layers/7370f7a0-03b4-4707-a9fe-e4fee021830a/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  93. BIN
      sprites/sEnemyShowerheadIdle/layers/7e0df1f3-28dc-45fa-b317-e7900ffb70e0/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  94. 102 0
      sprites/sEnemyShowerheadIdle/sEnemyShowerheadIdle.yy
  95. BIN
      sprites/sEnemyShowerheadRetreat/313d19ac-423c-4585-89d5-d727c8a6382e.png
  96. BIN
      sprites/sEnemyShowerheadRetreat/7e0df1f3-28dc-45fa-b317-e7900ffb70e0.png
  97. BIN
      sprites/sEnemyShowerheadRetreat/layers/313d19ac-423c-4585-89d5-d727c8a6382e/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  98. BIN
      sprites/sEnemyShowerheadRetreat/layers/7e0df1f3-28dc-45fa-b317-e7900ffb70e0/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png
  99. 94 0
      sprites/sEnemyShowerheadRetreat/sEnemyShowerheadRetreat.yy
  100. BIN
      sprites/sEnemyShowerheadSink/313d19ac-423c-4585-89d5-d727c8a6382e.png

+ 27 - 1
ddmyx.yyp

@@ -19,10 +19,13 @@
     {"$GMFolder":"","%Name":"Enemy","folderPath":"folders/Enemy.yy","name":"Enemy","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"oBossHex","folderPath":"folders/Enemy/oBossHex.yy","name":"oBossHex","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"oEnemyHex","folderPath":"folders/Enemy/oBossHex/oEnemyHex.yy","name":"oEnemyHex","resourceType":"GMFolder","resourceVersion":"2.0",},
+    {"$GMFolder":"","%Name":"oBossShowerhead","folderPath":"folders/Enemy/oBossShowerhead.yy","name":"oBossShowerhead","resourceType":"GMFolder","resourceVersion":"2.0",},
+    {"$GMFolder":"","%Name":"oShowerheadBomb","folderPath":"folders/Enemy/oBossShowerhead/oShowerheadBomb.yy","name":"oShowerheadBomb","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":"oEnemyShowerhead","folderPath":"folders/Enemy/oEnemyShowerhead.yy","name":"oEnemyShowerhead","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"oPlayerCorpse","folderPath":"folders/Enemy/oPlayerCorpse.yy","name":"oPlayerCorpse","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"Fonts","folderPath":"folders/Fonts.yy","name":"Fonts","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"Objects","folderPath":"folders/Objects.yy","name":"Objects","resourceType":"GMFolder","resourceVersion":"2.0",},
@@ -41,6 +44,7 @@
     {"$GMFolder":"","%Name":"Hitstun","folderPath":"folders/Player/Sprites/Hitstun.yy","name":"Hitstun","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"StateFree","folderPath":"folders/Player/Sprites/StateFree.yy","name":"StateFree","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"Rooms","folderPath":"folders/Rooms.yy","name":"Rooms","resourceType":"GMFolder","resourceVersion":"2.0",},
+    {"$GMFolder":"","%Name":"Dorm","folderPath":"folders/Rooms/Dorm.yy","name":"Dorm","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"Scripts","folderPath":"folders/Scripts.yy","name":"Scripts","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"Shaders","folderPath":"folders/Shaders.yy","name":"Shaders","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"UIsprite","folderPath":"folders/UIsprite.yy","name":"UIsprite","resourceType":"GMFolder","resourceVersion":"2.0",},
@@ -63,10 +67,12 @@
     {"id":{"name":"fTyper","path":"fonts/fTyper/fTyper.yy",},},
     {"id":{"name":"更新日志DrDuck","path":"notes/更新日志DrDuck/更新日志DrDuck.yy",},},
     {"id":{"name":"更新日志tianhaobu","path":"notes/更新日志tianhaobu/更新日志tianhaobu.yy",},},
+    {"id":{"name":"oAttackInteractive","path":"objects/oAttackInteractive/oAttackInteractive.yy",},},
     {"id":{"name":"oAudioManager","path":"objects/oAudioManager/oAudioManager.yy",},},
     {"id":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},},
     {"id":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},},
     {"id":{"name":"oBossHex","path":"objects/oBossHex/oBossHex.yy",},},
+    {"id":{"name":"oBossShowerhead","path":"objects/oBossShowerhead/oBossShowerhead.yy",},},
     {"id":{"name":"oBreakableSolid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},},
     {"id":{"name":"oBrokenSolid","path":"objects/oBrokenSolid/oBrokenSolid.yy",},},
     {"id":{"name":"oCamera","path":"objects/oCamera/oCamera.yy",},},
@@ -84,6 +90,7 @@
     {"id":{"name":"oEnemyFlyingTrack","path":"objects/oEnemyFlyingTrack/oEnemyFlyingTrack.yy",},},
     {"id":{"name":"oEnemyHex","path":"objects/oEnemyHex/oEnemyHex.yy",},},
     {"id":{"name":"oEnemyHitbox","path":"objects/oEnemyHitbox/oEnemyHitbox.yy",},},
+    {"id":{"name":"oEnemyShowerhead","path":"objects/oEnemyShowerhead/oEnemyShowerhead.yy",},},
     {"id":{"name":"oFade","path":"objects/oFade/oFade.yy",},},
     {"id":{"name":"oFocusEndEffect","path":"objects/oFocusEndEffect/oFocusEndEffect.yy",},},
     {"id":{"name":"oFocusingEffect","path":"objects/oFocusingEffect/oFocusingEffect.yy",},},
@@ -114,9 +121,9 @@
     {"id":{"name":"oRippleExpand","path":"objects/oRippleExpand/oRippleExpand.yy",},},
     {"id":{"name":"oRippleShrink","path":"objects/oRippleShrink/oRippleShrink.yy",},},
     {"id":{"name":"oSavePoint","path":"objects/oSavePoint/oSavePoint.yy",},},
+    {"id":{"name":"oShowerheadBomb","path":"objects/oShowerheadBomb/oShowerheadBomb.yy",},},
     {"id":{"name":"oSlicedApple","path":"objects/oSlicedApple/oSlicedApple.yy",},},
     {"id":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},},
-    {"id":{"name":"oTestInteractive","path":"objects/oTestInteractive/oTestInteractive.yy",},},
     {"id":{"name":"oTyper","path":"objects/oTyper/oTyper.yy",},},
     {"id":{"name":"oUI","path":"objects/oUI/oUI.yy",},},
     {"id":{"name":"peBladeHitHazard","path":"particles/peBladeHitHazard/peBladeHitHazard.yy",},},
@@ -127,11 +134,15 @@
     {"id":{"name":"rTest2","path":"rooms/rTest2/rTest2.yy",},},
     {"id":{"name":"rTest3","path":"rooms/rTest3/rTest3.yy",},},
     {"id":{"name":"rTest4","path":"rooms/rTest4/rTest4.yy",},},
+    {"id":{"name":"rTest5","path":"rooms/rTest5/rTest5.yy",},},
+    {"id":{"name":"rTest7","path":"rooms/rTest7/rTest7.yy",},},
     {"id":{"name":"rTitle","path":"rooms/rTitle/rTitle.yy",},},
     {"id":{"name":"AudioManager","path":"scripts/AudioManager/AudioManager.yy",},},
     {"id":{"name":"BossHexAI","path":"scripts/BossHexAI/BossHexAI.yy",},},
+    {"id":{"name":"BossShowerheadAI","path":"scripts/BossShowerheadAI/BossShowerheadAI.yy",},},
     {"id":{"name":"CrawlAI","path":"scripts/CrawlAI/CrawlAI.yy",},},
     {"id":{"name":"DummyAI","path":"scripts/DummyAI/DummyAI.yy",},},
+    {"id":{"name":"enemyShowerheadbombAI","path":"scripts/enemyShowerheadbombAI/enemyShowerheadbombAI.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",},},
@@ -141,6 +152,7 @@
     {"id":{"name":"ParticleEffects","path":"scripts/ParticleEffects/ParticleEffects.yy",},},
     {"id":{"name":"PlayerStates","path":"scripts/PlayerStates/PlayerStates.yy",},},
     {"id":{"name":"SaveLoad","path":"scripts/SaveLoad/SaveLoad.yy",},},
+    {"id":{"name":"ShowerheadAI","path":"scripts/ShowerheadAI/ShowerheadAI.yy",},},
     {"id":{"name":"Simplifier","path":"scripts/Simplifier/Simplifier.yy",},},
     {"id":{"name":"Typer","path":"scripts/Typer/Typer.yy",},},
     {"id":{"name":"sh_flash","path":"shaders/sh_flash/sh_flash.yy",},},
@@ -149,6 +161,12 @@
     {"id":{"name":"sBlockClimbable","path":"sprites/sBlockClimbable/sBlockClimbable.yy",},},
     {"id":{"name":"sBlockSlippery","path":"sprites/sBlockSlippery/sBlockSlippery.yy",},},
     {"id":{"name":"sBossHex","path":"sprites/sBossHex/sBossHex.yy",},},
+    {"id":{"name":"sBossShowerheadCharge","path":"sprites/sBossShowerheadCharge/sBossShowerheadCharge.yy",},},
+    {"id":{"name":"sBossShowerheadIdle","path":"sprites/sBossShowerheadIdle/sBossShowerheadIdle.yy",},},
+    {"id":{"name":"sBossShowerheadRetreat","path":"sprites/sBossShowerheadRetreat/sBossShowerheadRetreat.yy",},},
+    {"id":{"name":"sBossShowerheadShoot","path":"sprites/sBossShowerheadShoot/sBossShowerheadShoot.yy",},},
+    {"id":{"name":"sBossShowerheadSlam","path":"sprites/sBossShowerheadSlam/sBossShowerheadSlam.yy",},},
+    {"id":{"name":"sBossShowerheadWindup","path":"sprites/sBossShowerheadWindup/sBossShowerheadWindup.yy",},},
     {"id":{"name":"sBreakableSolid","path":"sprites/sBreakableSolid/sBreakableSolid.yy",},},
     {"id":{"name":"sBrokenSolid1","path":"sprites/sBrokenSolid1/sBrokenSolid1.yy",},},
     {"id":{"name":"sBrokenSolid2","path":"sprites/sBrokenSolid2/sBrokenSolid2.yy",},},
@@ -171,6 +189,11 @@
     {"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":"sEnemyShowerheadCharge","path":"sprites/sEnemyShowerheadCharge/sEnemyShowerheadCharge.yy",},},
+    {"id":{"name":"sEnemyShowerheadEmerge","path":"sprites/sEnemyShowerheadEmerge/sEnemyShowerheadEmerge.yy",},},
+    {"id":{"name":"sEnemyShowerheadIdle","path":"sprites/sEnemyShowerheadIdle/sEnemyShowerheadIdle.yy",},},
+    {"id":{"name":"sEnemyShowerheadRetreat","path":"sprites/sEnemyShowerheadRetreat/sEnemyShowerheadRetreat.yy",},},
+    {"id":{"name":"sEnemyShowerheadSink","path":"sprites/sEnemyShowerheadSink/sEnemyShowerheadSink.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",},},
@@ -196,6 +219,7 @@
     {"id":{"name":"sPlayerWalk","path":"sprites/sPlayerWalk/sPlayerWalk.yy",},},
     {"id":{"name":"sPlayerWall","path":"sprites/sPlayerWall/sPlayerWall.yy",},},
     {"id":{"name":"sRec32","path":"sprites/sRec32/sRec32.yy",},},
+    {"id":{"name":"sShowerheadBomb","path":"sprites/sShowerheadBomb/sShowerheadBomb.yy",},},
     {"id":{"name":"sSpike","path":"sprites/sSpike/sSpike.yy",},},
     {"id":{"name":"sTutorAttack","path":"sprites/sTutorAttack/sTutorAttack.yy",},},
     {"id":{"name":"sTutorAttackAlt","path":"sprites/sTutorAttackAlt/sTutorAttackAlt.yy",},},
@@ -221,6 +245,8 @@
     {"roomId":{"name":"rTest2","path":"rooms/rTest2/rTest2.yy",},},
     {"roomId":{"name":"rTest3","path":"rooms/rTest3/rTest3.yy",},},
     {"roomId":{"name":"rTest4","path":"rooms/rTest4/rTest4.yy",},},
+    {"roomId":{"name":"rTest5","path":"rooms/rTest5/rTest5.yy",},},
+    {"roomId":{"name":"rTest7","path":"rooms/rTest7/rTest7.yy",},},
   ],
   "templateType":"game",
   "TextureGroups":[

+ 1 - 1
objects/oTestInteractive/Create_0.gml → objects/oAttackInteractive/Create_0.gml

@@ -8,7 +8,7 @@ indi_y_offset = -192;
 callback = function()
 {
     type(["A familiar-looking pen lies quietly on the table.",
-	"It seems to be a right-hand weapon.",
+	"It seems to be a right hand weapon.",
 	"Press Z to attack."], interact_end);
 	global.save_data.player.abilities.attack = true;
 	

+ 2 - 2
objects/oTestInteractive/oTestInteractive.yy → objects/oAttackInteractive/oAttackInteractive.yy

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

+ 27 - 0
objects/oBossShowerhead/Create_0.gml

@@ -0,0 +1,27 @@
+event_inherited();
+
+hp = 200;
+
+hitstun_max = 0;
+kb_factor = 0;
+
+credit = 30;
+
+apply_collision = false;
+
+enemy_ai = boss_showerhead_ai;
+
+hitbox = enemy_create_hitboxMC(192, 192);
+
+state = "SPAWN";
+
+attack_queue = [1, 3, 1, 3, 2, 1, 2, 3, 1, 2, 2, 3];
+attack_index = irandom(array_length(attack_queue) - 1);
+phase        = 1;
+shoot_count  = 0;
+boss_side    = 1;
+anchor_l     = 128;
+anchor_r     = room_width - 128;
+idle_timer   = 0;
+retreat_spd  = 8;  // 后撤速度,较慢
+charge_spd   = 18; // 冲刺速度,要有压迫感

+ 41 - 0
objects/oBossShowerhead/oBossShowerhead.yy

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

+ 18 - 0
objects/oEnemyShowerhead/Create_0.gml

@@ -0,0 +1,18 @@
+event_inherited();
+
+hp = 19;
+
+wake_timer = irandom(60);
+
+hitstun_max = 0;
+kb_factor = 0;
+
+credit = 5;
+
+apply_collision = false;
+
+enemy_ai = enemy_showerhead_ai;
+
+hitbox = enemy_create_hitboxMC(56, 56);
+
+state = "WAIT";

+ 41 - 0
objects/oEnemyShowerhead/oEnemyShowerhead.yy

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

+ 1 - 0
objects/oParentEnemy/Create_0.gml

@@ -57,6 +57,7 @@ hitstun_max = 10;
 kb_factor = 1.0;
 
 collision_hitbox = noone;
+apply_collision = true;
 
 is_dead = false;
 

+ 1 - 1
objects/oParentEnemy/Draw_0.gml

@@ -21,5 +21,5 @@ if global.developer_mode
 	draw_set_valign(fa_middle);
 	draw_set_font(fTest);
 
-	//draw_text(x + 72, y, sprite_get_name(sprite_index) + " " + string(image_index));
+	draw_text(x + 72, y, sprite_get_name(sprite_index) + " " + string(image_index));
 }

+ 4 - 1
objects/oPlayerCorpse/oPlayerCorpse.yy

@@ -12,7 +12,10 @@
     "name":"oPlayerCorpse",
     "path":"folders/Enemy/oPlayerCorpse.yy",
   },
-  "parentObjectId":null,
+  "parentObjectId":{
+    "name":"oParentEnemy",
+    "path":"objects/oParentEnemy/oParentEnemy.yy",
+  },
   "persistent":false,
   "physicsAngularDamping":0.1,
   "physicsDensity":0.5,

+ 12 - 0
objects/oShowerheadBomb/Create_0.gml

@@ -0,0 +1,12 @@
+event_inherited();
+
+hp = 1;
+credit = 0;
+kb_factor = 0;
+hitstun_max = 0;
+has_ink = false;
+apply_collision = false;
+
+enemy_ai = enemy_showerheadbomb_ai;
+
+hitbox = enemy_create_hitboxMC(72, 72);

+ 41 - 0
objects/oShowerheadBomb/oShowerheadBomb.yy

@@ -0,0 +1,41 @@
+{
+  "$GMObject":"",
+  "%Name":"oShowerheadBomb",
+  "eventList":[
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
+  "managed":true,
+  "name":"oShowerheadBomb",
+  "overriddenProperties":[],
+  "parent":{
+    "name":"oShowerheadBomb",
+    "path":"folders/Enemy/oBossShowerhead/oShowerheadBomb.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":"sShowerheadBomb",
+    "path":"sprites/sShowerheadBomb/sShowerheadBomb.yy",
+  },
+  "spriteMaskId":null,
+  "visible":true,
+}

+ 4 - 4
rooms/rTest1/rTest1.yy

@@ -33,8 +33,8 @@
         {"$GMRInstance":"v4","%Name":"inst_4EC9D8FF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4EC9D8FF","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":50.0,"scaleY":1.5,"x":1600.0,"y":912.0,},
         {"$GMRInstance":"v4","%Name":"inst_306D7581","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_306D7581","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":13.5,"x":32.0,"y":432.0,},
         {"$GMRInstance":"v4","%Name":"inst_40F0FF48","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_40F0FF48","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":27.5,"scaleY":2.0,"x":2320.0,"y":800.0,},
-        {"$GMRInstance":"v4","%Name":"inst_72E53C15","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_72E53C15","objectId":{"name":"oTestInteractive","path":"objects/oTestInteractive/oTestInteractive.yy",},"properties":[
-            {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oTestInteractive","path":"objects/oTestInteractive/oTestInteractive.yy",},"propertyId":{"name":"uuid","path":"objects/oTestInteractive/oTestInteractive.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"rTest1_Attack",},
+        {"$GMRInstance":"v4","%Name":"inst_72E53C15","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_72E53C15","objectId":{"name":"oAttackInteractive","path":"objects/oAttackInteractive/oAttackInteractive.yy",},"properties":[
+            {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oAttackInteractive","path":"objects/oAttackInteractive/oAttackInteractive.yy",},"propertyId":{"name":"uuid","path":"objects/oAttackInteractive/oAttackInteractive.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"rTest1_Attack",},
           ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":864.0,},
         {"$GMRInstance":"v4","%Name":"inst_3B38CB07","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3B38CB07","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":2.0,"scaleY":6.5,"x":1952.0,"y":272.0,},
         {"$GMRInstance":"v4","%Name":"inst_68597383","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_68597383","objectId":{"name":"oBreakableSolid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"properties":[
@@ -58,8 +58,8 @@
   ],
   "name":"rTest1",
   "parent":{
-    "name":"Rooms",
-    "path":"folders/Rooms.yy",
+    "name":"Dorm",
+    "path":"folders/Rooms/Dorm.yy",
   },
   "parentRoom":null,
   "physicsSettings":{

+ 2 - 2
rooms/rTest2/rTest2.yy

@@ -64,8 +64,8 @@
   ],
   "name":"rTest2",
   "parent":{
-    "name":"Rooms",
-    "path":"folders/Rooms.yy",
+    "name":"Dorm",
+    "path":"folders/Rooms/Dorm.yy",
   },
   "parentRoom":null,
   "physicsSettings":{

+ 2 - 2
rooms/rTest3/rTest3.yy

@@ -82,8 +82,8 @@
   ],
   "name":"rTest3",
   "parent":{
-    "name":"Rooms",
-    "path":"folders/Rooms.yy",
+    "name":"Dorm",
+    "path":"folders/Rooms/Dorm.yy",
   },
   "parentRoom":null,
   "physicsSettings":{

+ 5 - 5
rooms/rTest4/rTest4.yy

@@ -62,7 +62,7 @@
         {"$GMRInstance":"v4","%Name":"inst_6DA0D29A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6DA0D29A","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":2.0,"x":256.0,"y":1056.0,},
         {"$GMRInstance":"v4","%Name":"inst_4DCD0DDA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4DCD0DDA","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":3.0,"scaleY":1.0,"x":992.0,"y":544.0,},
         {"$GMRInstance":"v4","%Name":"inst_645F8582","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_645F8582","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":4.0,"scaleY":1.0,"x":1472.0,"y":384.0,},
-        {"$GMRInstance":"v4","%Name":"inst_5A12A226","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5A12A226","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":11.5,"scaleY":1.0,"x":1168.0,"y":32.0,},
+        {"$GMRInstance":"v4","%Name":"inst_5A12A226","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5A12A226","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":12.0,"scaleY":1.0,"x":1184.0,"y":32.0,},
         {"$GMRInstance":"v4","%Name":"inst_600DABD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_600DABD","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":3.5,"x":832.0,"y":176.0,},
         {"$GMRInstance":"v4","%Name":"inst_4938B1E0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4938B1E0","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":3.0,"scaleY":1.0,"x":960.0,"y":96.0,},
         {"$GMRInstance":"v4","%Name":"inst_7DEB2FE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7DEB2FE","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":2.0,"scaleY":1.0,"x":928.0,"y":160.0,},
@@ -70,18 +70,18 @@
         {"$GMRInstance":"v4","%Name":"inst_21F0C03D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_21F0C03D","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":4.0,"scaleY":1.0,"x":1728.0,"y":384.0,},
         {"$GMRInstance":"v4","%Name":"inst_4D1A45F8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4D1A45F8","objectId":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},"properties":[
             {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},"propertyId":{"name":"target_room","path":"objects/oDoor/oDoor.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"rTest5",},
-            {"$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":"0",},
+            {"$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":"0",},
             {"$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":"DOWN",},
-          ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":90.0,"scaleX":1.0,"scaleY":1.75,"x":1696.0,"y":-32.0,},
+          ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":90.0,"scaleX":1.0,"scaleY":1.5,"x":1728.0,"y":-32.0,},
       ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,},
     {"$GMRInstanceLayer":"","%Name":"Effect","depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[],"layers":[],"name":"Effect","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,},
     {"$GMRBackgroundLayer":"","%Name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4278190080,"depth":200,"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,},
   ],
   "name":"rTest4",
   "parent":{
-    "name":"Rooms",
-    "path":"folders/Rooms.yy",
+    "name":"Dorm",
+    "path":"folders/Rooms/Dorm.yy",
   },
   "parentRoom":null,
   "physicsSettings":{

+ 1 - 0
rooms/rTest5/RoomCreationCode.gml

@@ -0,0 +1 @@
+camera_set_bounds(0, room_width, 0, room_height);

+ 82 - 0
rooms/rTest5/rTest5.yy

@@ -0,0 +1,82 @@
+{
+  "$GMRoom":"v1",
+  "%Name":"rTest5",
+  "creationCodeFile":"rooms/rTest5/RoomCreationCode.gml",
+  "inheritCode":false,
+  "inheritCreationOrder":false,
+  "inheritLayers":false,
+  "instanceCreationOrder":[
+    {"name":"inst_69C973EB1","path":"rooms/rTest5/rTest5.yy",},
+    {"name":"inst_45595C2_1","path":"rooms/rTest5/rTest5.yy",},
+    {"name":"inst_1B12CEF0_1","path":"rooms/rTest5/rTest5.yy",},
+    {"name":"inst_2C4BD67A1","path":"rooms/rTest5/rTest5.yy",},
+    {"name":"inst_6A147043_1","path":"rooms/rTest5/rTest5.yy",},
+    {"name":"inst_2424411A","path":"rooms/rTest5/rTest5.yy",},
+    {"name":"inst_24E31DFE","path":"rooms/rTest5/rTest5.yy",},
+    {"name":"inst_3EF1839E","path":"rooms/rTest5/rTest5.yy",},
+  ],
+  "isDnd":false,
+  "layers":[
+    {"$GMRInstanceLayer":"","%Name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[
+        {"$GMRInstance":"v4","%Name":"inst_69C973EB1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_69C973EB1","objectId":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},"properties":[
+            {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},"propertyId":{"name":"target_room","path":"objects/oDoor/oDoor.yy",},"resource":{"name":"rTest4","path":"rooms/rTest4/rTest4.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"rTest4",},
+            {"$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":"0",},
+            {"$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":"UP",},
+          ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":-90.0,"scaleX":1.0,"scaleY":1.5,"x":1696.0,"y":736.0,},
+        {"$GMRInstance":"v4","%Name":"inst_45595C2_1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_45595C2_1","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":24.5,"scaleY":1.5,"x":784.0,"y":688.0,},
+        {"$GMRInstance":"v4","%Name":"inst_1B12CEF0_1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1B12CEF0_1","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":11.5,"scaleY":1.0,"x":1552.0,"y":32.0,},
+        {"$GMRInstance":"v4","%Name":"inst_2C4BD67A1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2C4BD67A1","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":18.5,"scaleY":1.0,"x":592.0,"y":32.0,},
+        {"$GMRInstance":"v4","%Name":"inst_6A147043_1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6A147043_1","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":6.5,"x":32.0,"y":208.0,},
+        {"$GMRInstance":"v4","%Name":"inst_2424411A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2424411A","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":10.5,"x":1888.0,"y":400.0,},
+        {"$GMRInstance":"v4","%Name":"inst_24E31DFE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_24E31DFE","objectId":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},"properties":[
+            {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},"propertyId":{"name":"target_room","path":"objects/oDoor/oDoor.yy",},"resource":{"name":"rTest7","path":"rooms/rTest7/rTest7.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"rTest7",},
+            {"$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":"0",},
+            {"$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":"RIGHT",},
+          ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.5,"x":-32.0,"y":640.0,},
+        {"$GMRInstance":"v4","%Name":"inst_3EF1839E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3EF1839E","objectId":{"name":"oSavePoint","path":"objects/oSavePoint/oSavePoint.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1376.0,"y":640.0,},
+      ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,},
+    {"$GMRInstanceLayer":"","%Name":"Effect","depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[],"layers":[],"name":"Effect","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,},
+    {"$GMRBackgroundLayer":"","%Name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4278190080,"depth":200,"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,},
+  ],
+  "name":"rTest5",
+  "parent":{
+    "name":"Dorm",
+    "path":"folders/Rooms/Dorm.yy",
+  },
+  "parentRoom":null,
+  "physicsSettings":{
+    "inheritPhysicsSettings":false,
+    "PhysicsWorld":false,
+    "PhysicsWorldGravityX":0.0,
+    "PhysicsWorldGravityY":10.0,
+    "PhysicsWorldPixToMetres":0.1,
+  },
+  "resourceType":"GMRoom",
+  "resourceVersion":"2.0",
+  "roomSettings":{
+    "Height":720,
+    "inheritRoomSettings":false,
+    "persistent":false,
+    "Width":1920,
+  },
+  "sequenceId":null,
+  "views":[
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+  ],
+  "viewSettings":{
+    "clearDisplayBuffer":true,
+    "clearViewBackground":false,
+    "enableViews":false,
+    "inheritViewSettings":false,
+  },
+  "volume":1.0,
+}

+ 1 - 0
rooms/rTest7/RoomCreationCode.gml

@@ -0,0 +1 @@
+camera_set_bounds(0, room_width, 0, room_height);

+ 75 - 0
rooms/rTest7/rTest7.yy

@@ -0,0 +1,75 @@
+{
+  "$GMRoom":"v1",
+  "%Name":"rTest7",
+  "creationCodeFile":"rooms/rTest7/RoomCreationCode.gml",
+  "inheritCode":false,
+  "inheritCreationOrder":false,
+  "inheritLayers":false,
+  "instanceCreationOrder":[
+    {"name":"inst_1B12CEF0_1_1","path":"rooms/rTest7/rTest7.yy",},
+    {"name":"inst_2C4BD67A1_1","path":"rooms/rTest7/rTest7.yy",},
+    {"name":"inst_6A147043_1_1","path":"rooms/rTest7/rTest7.yy",},
+    {"name":"inst_2424411A1","path":"rooms/rTest7/rTest7.yy",},
+    {"name":"inst_45595C2_1_1","path":"rooms/rTest7/rTest7.yy",},
+    {"name":"inst_E75B776","path":"rooms/rTest7/rTest7.yy",},
+    {"name":"inst_41633961","path":"rooms/rTest7/rTest7.yy",},
+  ],
+  "isDnd":false,
+  "layers":[
+    {"$GMRInstanceLayer":"","%Name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[
+        {"$GMRInstance":"v4","%Name":"inst_45595C2_1_1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_45595C2_1_1","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":20.0,"scaleY":1.5,"x":640.0,"y":688.0,},
+        {"$GMRInstance":"v4","%Name":"inst_1B12CEF0_1_1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1B12CEF0_1_1","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.5,"scaleY":1.0,"x":1232.0,"y":32.0,},
+        {"$GMRInstance":"v4","%Name":"inst_2C4BD67A1_1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2C4BD67A1_1","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":18.5,"scaleY":1.0,"x":592.0,"y":32.0,},
+        {"$GMRInstance":"v4","%Name":"inst_6A147043_1_1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6A147043_1_1","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":10.0,"x":32.0,"y":320.0,},
+        {"$GMRInstance":"v4","%Name":"inst_2424411A1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2424411A1","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":5.5,"x":1248.0,"y":240.0,},
+        {"$GMRInstance":"v4","%Name":"inst_E75B776","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E75B776","objectId":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},"properties":[
+            {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},"propertyId":{"name":"target_room","path":"objects/oDoor/oDoor.yy",},"resource":{"name":"rTest5","path":"rooms/rTest5/rTest5.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"rTest5",},
+            {"$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":"0",},
+            {"$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",},
+          ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.5,"x":1312.0,"y":640.0,},
+        {"$GMRInstance":"v4","%Name":"inst_41633961","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_41633961","objectId":{"name":"oBossShowerhead","path":"objects/oBossShowerhead/oBossShowerhead.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":720.0,},
+      ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,},
+    {"$GMRInstanceLayer":"","%Name":"Effect","depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[],"layers":[],"name":"Effect","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,},
+    {"$GMRBackgroundLayer":"","%Name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4278190080,"depth":200,"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,},
+  ],
+  "name":"rTest7",
+  "parent":{
+    "name":"Dorm",
+    "path":"folders/Rooms/Dorm.yy",
+  },
+  "parentRoom":null,
+  "physicsSettings":{
+    "inheritPhysicsSettings":false,
+    "PhysicsWorld":false,
+    "PhysicsWorldGravityX":0.0,
+    "PhysicsWorldGravityY":10.0,
+    "PhysicsWorldPixToMetres":0.1,
+  },
+  "resourceType":"GMRoom",
+  "resourceVersion":"2.0",
+  "roomSettings":{
+    "Height":720,
+    "inheritRoomSettings":false,
+    "persistent":false,
+    "Width":1280,
+  },
+  "sequenceId":null,
+  "views":[
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":0,"yport":0,"yview":0,},
+  ],
+  "viewSettings":{
+    "clearDisplayBuffer":true,
+    "clearViewBackground":false,
+    "enableViews":false,
+    "inheritViewSettings":false,
+  },
+  "volume":1.0,
+}

+ 102 - 0
scripts/BossShowerheadAI/BossShowerheadAI.gml

@@ -0,0 +1,102 @@
+function boss_showerhead_ai()
+{
+    facing_x   = sign(global.player.x - x);
+    image_xscale = facing_x;
+    
+    switch(state)
+    {
+        case "SPAWN":
+			state = "IDLE";
+            idle_timer = 60;
+            break;
+        
+        case "IDLE":
+            if --idle_timer <= 0
+            {
+                var _next = attack_queue[attack_index];
+                attack_index = (attack_index + 1) % array_length(attack_queue);
+                
+                switch(_next)
+                {
+                    case 1:
+                        state = "WINDUP";
+                        set_sprite(sBossShowerheadWindup);
+                        break;
+                    case 2:
+                        state = "SLAM";
+                        set_sprite(sBossShowerheadSlam);
+                        break;
+                    case 3:
+                        state = "RETREAT";
+                        x_spd = -boss_side * retreat_spd;
+                        set_sprite(sBossShowerheadRetreat);
+                        break;
+                }
+            }
+            break;
+        
+        case "WINDUP":
+            if animation_end()
+            {
+                shoot_count = 0;
+                state = "SHOOT";
+                set_sprite(sBossShowerheadShoot);
+            }
+            break;
+        
+        case "SHOOT":
+            if animation_end()
+            {
+                var _bomb = icl(oShowerheadBomb);
+                _bomb.x_spd = facing_x * (8 + shoot_count * 2);
+                _bomb.y_spd = -10;
+                
+                shoot_count++;
+                if shoot_count >= 3
+                {
+                    state = "IDLE";
+                    idle_timer = 60;
+                    set_sprite(sBossShowerheadIdle);
+                }
+            }
+            break;
+        
+        case "SLAM":
+            if animation_end()
+            {
+                // 生成预警线控制器
+                var _warn = icl(oBossWarning);
+                _warn.phase = phase;
+                
+                state = "IDLE";
+                idle_timer = 60;
+                set_sprite(sBossShowerheadIdle);
+            }
+            break;
+        
+        case "RETREAT":
+            var _target = (boss_side == 1) ? anchor_l : anchor_r;
+            if abs(x - _target) < abs(x_spd)
+            {
+                x     = _target;
+                x_spd = 0;
+                state = "CHARGE";
+                x_spd = boss_side * charge_spd;
+                set_sprite(sBossShowerheadCharge);
+            }
+            break;
+        
+        case "CHARGE":
+            var _target = (boss_side == 1) ? anchor_r : anchor_l;
+            if abs(x - _target) < abs(x_spd)
+            {
+                x        = _target;
+                x_spd    = 0;
+                boss_side *= -1; // 换边
+                state      = "IDLE";
+                idle_timer = 60;
+                set_sprite(sBossShowerheadIdle);
+            }
+            break;
+    }
+}

+ 13 - 0
scripts/BossShowerheadAI/BossShowerheadAI.yy

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

+ 12 - 27
scripts/EnemyStates/EnemyStates.gml

@@ -3,7 +3,7 @@ function enemy_move_and_collide()
 	var _y_spd_total = (y_spd + y_spd_kb) * global.time_scale;
 	var _x_spd_total = (x_spd + x_spd_kb) * global.time_scale;
 	
-    if place_meeting(x, y + _y_spd_total, oParentSolid)
+    if place_meeting(x, y + _y_spd_total, oParentSolid) && apply_collision
     {
         while !place_meeting(x, y + sign(_y_spd_total), oParentSolid)
             y += sign(_y_spd_total);
@@ -14,7 +14,7 @@ function enemy_move_and_collide()
     }
     y += _y_spd_total;
 
-    if place_meeting(x + _x_spd_total, y, oParentSolid)
+    if place_meeting(x + _x_spd_total, y, oParentSolid) && apply_collision
     {
         while !place_meeting(x + sign(_x_spd_total), y, oParentSolid)
             x += sign(_x_spd_total);
@@ -28,30 +28,15 @@ function enemy_move_and_collide()
 
 function enemy_check_hazard()
 {
-	var _current_hazard = instance_place(x, y, oParentHazard);
-	
-	if _current_hazard != noone
-	{
-		hp -= _current_hazard.damage;
-		if hp <= 0
-		{
-			is_dead = true;
-			instance_destroy();
-		}
-	}
-	
-	if hitstun_timer > 0
-		return;
-	
-	var _dist_x = x_spd + (sign(x_spd) * sprite_width * 0.25);
-	var _dist_y = y_spd + (sign(y_spd) * sprite_height * 0.25);
-	
-	if place_meeting(x + _dist_x, y, oParentSolid) ||
-	place_meeting(x + _dist_x, y, oParentHazard)
-        x_spd = 0;
-		
-	if place_meeting(x, y + _dist_y, oParentHazard)
-        y_spd = 0;
+    var _hazard = instance_place(x, y, oParentHazard);
+    if _hazard == noone exit;
+    
+    hp -= _hazard.damage;
+    if hp <= 0
+    {
+        is_dead = true;
+        enemy_death();
+    }
 }
 
 function enemy_check_hitstun()
@@ -150,7 +135,7 @@ _x_offset = 0, _y_offset = 0, _duration = 0)
 	return _hb;
 }
 
-function enemy_death()
+function enemy_death()//诶我怎么似了
 {
 	var _corpse = icd(oEnemyCorpse, x, y, 50);
 	_corpse.x_spd = x_spd_kb;

+ 82 - 0
scripts/ShowerheadAI/ShowerheadAI.gml

@@ -0,0 +1,82 @@
+function enemy_showerhead_ai()
+{
+	facing_x = sign(global.player.x - x);
+	image_xscale = facing_x;
+	var _margin = 320;
+	var _sink_wait = (global.player.x < _margin || global.player.x > room_width - _margin);
+	switch(state)
+	{		
+		case "WAIT":
+			if _sink_wait
+				wake_timer = irandom(60);
+			else if --wake_timer <= 0
+			{
+				x = global.player.x + choose(-1, 1) * irandom_range(160, 192);
+				state = "EMERGE";
+				y_spd = -15;
+				set_sprite(sEnemyShowerheadEmerge);
+			}
+			break;
+		
+		case "IDLE":
+			if --idle_timer <= 0
+			{
+				state = nxt_state;
+				if state == "RETREAT"
+				{
+					x_spd = -facing_x * 10;
+					set_sprite(sEnemyShowerheadRetreat);
+				}
+				else if state == "SINK"
+				{
+					y_spd = 15;
+					set_sprite(sEnemyShowerheadSink);
+				}
+				else if state == "CHARGE"
+				{
+					x_spd = facing_x * 30;
+					set_sprite(sEnemyShowerheadCharge);
+				}				
+			}
+			break;
+				
+		case "SINK":
+			if animation_end()
+			{
+				state = "WAIT";
+				y_spd = 0;
+			}
+			break;
+		
+		case "EMERGE":
+			if animation_end()
+			{
+				y_spd = 0;
+				set_sprite(sEnemyShowerheadIdle);
+				idle_timer = 40;
+				state = "IDLE";
+				nxt_state = "RETREAT";
+			}
+			break;
+				
+		case "RETREAT":
+			if animation_end()
+			{
+				x_spd = 0;
+				idle_timer = 6;
+				state = "IDLE";
+				nxt_state = "CHARGE";
+			}
+			break;
+			
+		case "CHARGE":
+			if animation_end()
+			{
+				x_spd = 0;
+				idle_timer = 40;
+				state = "IDLE";
+				nxt_state = "SINK";
+				set_sprite(sEnemyShowerheadIdle);
+			}
+	}
+}

+ 13 - 0
scripts/ShowerheadAI/ShowerheadAI.yy

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

+ 31 - 0
scripts/enemyShowerheadbombAI/enemyShowerheadbombAI.gml

@@ -0,0 +1,31 @@
+function enemyShowerheadbombAI()
+{
+    y_spd += global.g;
+    
+    if place_meeting(x, y + y_spd, oParentSolid)
+    {
+        while !place_meeting(x, y + sign(y_spd), oParentSolid)
+            y += sign(y_spd);
+        y_spd *= -bounce_factor;
+        bounce_count++;
+        
+        if bounce_count >= 2
+        {
+            hp = 0;
+            is_dead = true;
+            enemy_death();
+            exit;
+        }
+    }
+    
+    if place_meeting(x + x_spd, y, oParentSolid)
+    {
+        hp = 0;
+        is_dead = true;
+        enemy_death();
+        exit;
+    }
+    
+    x += x_spd * global.time_scale;
+    y += y_spd * global.time_scale;
+};

+ 13 - 0
scripts/enemyShowerheadbombAI/enemyShowerheadbombAI.yy

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

BIN
sprites/sBossShowerheadCharge/05716c78-1f90-40a4-bc59-d15f2c7271cd.png


BIN
sprites/sBossShowerheadCharge/781bd6bb-8b60-4027-98da-ef3e79aef945.png


BIN
sprites/sBossShowerheadCharge/8258407d-a704-4d90-b699-60dd7f6886bc.png


BIN
sprites/sBossShowerheadCharge/layers/05716c78-1f90-40a4-bc59-d15f2c7271cd/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


BIN
sprites/sBossShowerheadCharge/layers/781bd6bb-8b60-4027-98da-ef3e79aef945/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


BIN
sprites/sBossShowerheadCharge/layers/8258407d-a704-4d90-b699-60dd7f6886bc/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


+ 98 - 0
sprites/sBossShowerheadCharge/sBossShowerheadCharge.yy

@@ -0,0 +1,98 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sBossShowerheadCharge",
+  "bboxMode":0,
+  "bbox_bottom":359,
+  "bbox_left":68,
+  "bbox_right":333,
+  "bbox_top":31,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"05716c78-1f90-40a4-bc59-d15f2c7271cd","name":"05716c78-1f90-40a4-bc59-d15f2c7271cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"781bd6bb-8b60-4027-98da-ef3e79aef945","name":"781bd6bb-8b60-4027-98da-ef3e79aef945","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"8258407d-a704-4d90-b699-60dd7f6886bc","name":"8258407d-a704-4d90-b699-60dd7f6886bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":360,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"f24b423d-90db-4b9e-8790-8dafbebd16f4","blendMode":0,"displayName":"default","isLocked":false,"name":"f24b423d-90db-4b9e-8790-8dafbebd16f4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sBossShowerheadCharge",
+  "nineSlice":null,
+  "origin":9,
+  "parent":{
+    "name":"oBossShowerhead",
+    "path":"folders/Enemy/oBossShowerhead.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sBossShowerheadCharge",
+    "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":3.0,
+    "lockOrigin":false,
+    "moments":{
+      "$KeyframeStore<MomentsEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MomentsEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "name":"sBossShowerheadCharge",
+    "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":"05716c78-1f90-40a4-bc59-d15f2c7271cd","path":"sprites/sBossShowerheadCharge/sBossShowerheadCharge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"bfc9f501-9aa5-4620-8bb7-7cd13d500e02","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"781bd6bb-8b60-4027-98da-ef3e79aef945","path":"sprites/sBossShowerheadCharge/sBossShowerheadCharge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"8205ae71-042a-4868-8815-9a2bbd3f57c4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8258407d-a704-4d90-b699-60dd7f6886bc","path":"sprites/sBossShowerheadCharge/sBossShowerheadCharge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"22832475-c813-44ce-b554-f73f700cce51","IsCreationKey":false,"Key":2.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":235,
+    "yorigin":164,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":360,
+}

BIN
sprites/sBossShowerheadIdle/05716c78-1f90-40a4-bc59-d15f2c7271cd.png


BIN
sprites/sBossShowerheadIdle/layers/05716c78-1f90-40a4-bc59-d15f2c7271cd/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


+ 90 - 0
sprites/sBossShowerheadIdle/sBossShowerheadIdle.yy

@@ -0,0 +1,90 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sBossShowerheadIdle",
+  "bboxMode":0,
+  "bbox_bottom":359,
+  "bbox_left":68,
+  "bbox_right":333,
+  "bbox_top":31,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"05716c78-1f90-40a4-bc59-d15f2c7271cd","name":"05716c78-1f90-40a4-bc59-d15f2c7271cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":360,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"f24b423d-90db-4b9e-8790-8dafbebd16f4","blendMode":0,"displayName":"default","isLocked":false,"name":"f24b423d-90db-4b9e-8790-8dafbebd16f4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sBossShowerheadIdle",
+  "nineSlice":null,
+  "origin":9,
+  "parent":{
+    "name":"oBossShowerhead",
+    "path":"folders/Enemy/oBossShowerhead.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sBossShowerheadIdle",
+    "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":"sBossShowerheadIdle",
+    "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":"05716c78-1f90-40a4-bc59-d15f2c7271cd","path":"sprites/sBossShowerheadIdle/sBossShowerheadIdle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"bfc9f501-9aa5-4620-8bb7-7cd13d500e02","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":235,
+    "yorigin":164,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":360,
+}

BIN
sprites/sBossShowerheadRetreat/05716c78-1f90-40a4-bc59-d15f2c7271cd.png


BIN
sprites/sBossShowerheadRetreat/layers/05716c78-1f90-40a4-bc59-d15f2c7271cd/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


+ 90 - 0
sprites/sBossShowerheadRetreat/sBossShowerheadRetreat.yy

@@ -0,0 +1,90 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sBossShowerheadRetreat",
+  "bboxMode":0,
+  "bbox_bottom":359,
+  "bbox_left":68,
+  "bbox_right":333,
+  "bbox_top":31,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"05716c78-1f90-40a4-bc59-d15f2c7271cd","name":"05716c78-1f90-40a4-bc59-d15f2c7271cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":360,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"f24b423d-90db-4b9e-8790-8dafbebd16f4","blendMode":0,"displayName":"default","isLocked":false,"name":"f24b423d-90db-4b9e-8790-8dafbebd16f4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sBossShowerheadRetreat",
+  "nineSlice":null,
+  "origin":9,
+  "parent":{
+    "name":"oBossShowerhead",
+    "path":"folders/Enemy/oBossShowerhead.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sBossShowerheadRetreat",
+    "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":"sBossShowerheadRetreat",
+    "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":"05716c78-1f90-40a4-bc59-d15f2c7271cd","path":"sprites/sBossShowerheadRetreat/sBossShowerheadRetreat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"bfc9f501-9aa5-4620-8bb7-7cd13d500e02","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":235,
+    "yorigin":164,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":360,
+}

BIN
sprites/sBossShowerheadShoot/05716c78-1f90-40a4-bc59-d15f2c7271cd.png


BIN
sprites/sBossShowerheadShoot/21385170-a800-4ce3-b734-c2d1ef2963ad.png


BIN
sprites/sBossShowerheadShoot/3409e7ce-f0e3-4ddf-9afe-b98070d88418.png


BIN
sprites/sBossShowerheadShoot/55bd6677-5da9-4f79-9be1-a01e096518cb.png


BIN
sprites/sBossShowerheadShoot/7412f23b-2103-4a8a-be57-ea17a6de89e6.png


BIN
sprites/sBossShowerheadShoot/7c81463d-38df-4605-bc3a-71a3d10590b3.png


BIN
sprites/sBossShowerheadShoot/9f690533-9c05-411b-96e3-7c3d830f529d.png


BIN
sprites/sBossShowerheadShoot/ab536ce0-4c69-403a-86fe-8db67e1c7af4.png


BIN
sprites/sBossShowerheadShoot/c86c8d20-040d-4456-b475-36de0bd33a3a.png


BIN
sprites/sBossShowerheadShoot/cd688d98-6cbb-4360-9ae3-82ffc614546d.png


BIN
sprites/sBossShowerheadShoot/layers/05716c78-1f90-40a4-bc59-d15f2c7271cd/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


BIN
sprites/sBossShowerheadShoot/layers/21385170-a800-4ce3-b734-c2d1ef2963ad/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


BIN
sprites/sBossShowerheadShoot/layers/3409e7ce-f0e3-4ddf-9afe-b98070d88418/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


BIN
sprites/sBossShowerheadShoot/layers/55bd6677-5da9-4f79-9be1-a01e096518cb/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


BIN
sprites/sBossShowerheadShoot/layers/7412f23b-2103-4a8a-be57-ea17a6de89e6/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


BIN
sprites/sBossShowerheadShoot/layers/7c81463d-38df-4605-bc3a-71a3d10590b3/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


BIN
sprites/sBossShowerheadShoot/layers/9f690533-9c05-411b-96e3-7c3d830f529d/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


BIN
sprites/sBossShowerheadShoot/layers/ab536ce0-4c69-403a-86fe-8db67e1c7af4/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


BIN
sprites/sBossShowerheadShoot/layers/c86c8d20-040d-4456-b475-36de0bd33a3a/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


BIN
sprites/sBossShowerheadShoot/layers/cd688d98-6cbb-4360-9ae3-82ffc614546d/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


+ 126 - 0
sprites/sBossShowerheadShoot/sBossShowerheadShoot.yy

@@ -0,0 +1,126 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sBossShowerheadShoot",
+  "bboxMode":0,
+  "bbox_bottom":359,
+  "bbox_left":68,
+  "bbox_right":333,
+  "bbox_top":31,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"05716c78-1f90-40a4-bc59-d15f2c7271cd","name":"05716c78-1f90-40a4-bc59-d15f2c7271cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"7c81463d-38df-4605-bc3a-71a3d10590b3","name":"7c81463d-38df-4605-bc3a-71a3d10590b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"21385170-a800-4ce3-b734-c2d1ef2963ad","name":"21385170-a800-4ce3-b734-c2d1ef2963ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"ab536ce0-4c69-403a-86fe-8db67e1c7af4","name":"ab536ce0-4c69-403a-86fe-8db67e1c7af4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"c86c8d20-040d-4456-b475-36de0bd33a3a","name":"c86c8d20-040d-4456-b475-36de0bd33a3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"cd688d98-6cbb-4360-9ae3-82ffc614546d","name":"cd688d98-6cbb-4360-9ae3-82ffc614546d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"55bd6677-5da9-4f79-9be1-a01e096518cb","name":"55bd6677-5da9-4f79-9be1-a01e096518cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"9f690533-9c05-411b-96e3-7c3d830f529d","name":"9f690533-9c05-411b-96e3-7c3d830f529d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"7412f23b-2103-4a8a-be57-ea17a6de89e6","name":"7412f23b-2103-4a8a-be57-ea17a6de89e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"3409e7ce-f0e3-4ddf-9afe-b98070d88418","name":"3409e7ce-f0e3-4ddf-9afe-b98070d88418","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":360,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"f24b423d-90db-4b9e-8790-8dafbebd16f4","blendMode":0,"displayName":"default","isLocked":false,"name":"f24b423d-90db-4b9e-8790-8dafbebd16f4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sBossShowerheadShoot",
+  "nineSlice":null,
+  "origin":9,
+  "parent":{
+    "name":"oBossShowerhead",
+    "path":"folders/Enemy/oBossShowerhead.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sBossShowerheadShoot",
+    "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":10.0,
+    "lockOrigin":false,
+    "moments":{
+      "$KeyframeStore<MomentsEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MomentsEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "name":"sBossShowerheadShoot",
+    "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":"05716c78-1f90-40a4-bc59-d15f2c7271cd","path":"sprites/sBossShowerheadShoot/sBossShowerheadShoot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"bfc9f501-9aa5-4620-8bb7-7cd13d500e02","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c81463d-38df-4605-bc3a-71a3d10590b3","path":"sprites/sBossShowerheadShoot/sBossShowerheadShoot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"8e618825-1508-4b26-aaed-ab3d51518d26","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"21385170-a800-4ce3-b734-c2d1ef2963ad","path":"sprites/sBossShowerheadShoot/sBossShowerheadShoot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"c8ba89c3-d932-41b8-ae71-56edd3942d44","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab536ce0-4c69-403a-86fe-8db67e1c7af4","path":"sprites/sBossShowerheadShoot/sBossShowerheadShoot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"59dd20ad-2ad3-4f50-84bc-c81be995c222","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c86c8d20-040d-4456-b475-36de0bd33a3a","path":"sprites/sBossShowerheadShoot/sBossShowerheadShoot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"1973426d-a564-4a80-939f-f7b6c8ade3e9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd688d98-6cbb-4360-9ae3-82ffc614546d","path":"sprites/sBossShowerheadShoot/sBossShowerheadShoot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"9592594d-c4ca-4979-97f9-217add668664","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55bd6677-5da9-4f79-9be1-a01e096518cb","path":"sprites/sBossShowerheadShoot/sBossShowerheadShoot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"910ef1c2-1f87-43c1-9353-8d4d132aa69d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f690533-9c05-411b-96e3-7c3d830f529d","path":"sprites/sBossShowerheadShoot/sBossShowerheadShoot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"1b3b67d9-d726-406f-99f7-c9756ccd0a09","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7412f23b-2103-4a8a-be57-ea17a6de89e6","path":"sprites/sBossShowerheadShoot/sBossShowerheadShoot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"700c849e-dc14-47db-adca-417aa99b6e3a","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3409e7ce-f0e3-4ddf-9afe-b98070d88418","path":"sprites/sBossShowerheadShoot/sBossShowerheadShoot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"4beba762-9c08-405b-a47c-d6883b258df0","IsCreationKey":false,"Key":9.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":235,
+    "yorigin":164,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":360,
+}

BIN
sprites/sBossShowerheadSlam/05716c78-1f90-40a4-bc59-d15f2c7271cd.png


BIN
sprites/sBossShowerheadSlam/layers/05716c78-1f90-40a4-bc59-d15f2c7271cd/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


+ 90 - 0
sprites/sBossShowerheadSlam/sBossShowerheadSlam.yy

@@ -0,0 +1,90 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sBossShowerheadSlam",
+  "bboxMode":0,
+  "bbox_bottom":359,
+  "bbox_left":68,
+  "bbox_right":333,
+  "bbox_top":31,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"05716c78-1f90-40a4-bc59-d15f2c7271cd","name":"05716c78-1f90-40a4-bc59-d15f2c7271cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":360,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"f24b423d-90db-4b9e-8790-8dafbebd16f4","blendMode":0,"displayName":"default","isLocked":false,"name":"f24b423d-90db-4b9e-8790-8dafbebd16f4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sBossShowerheadSlam",
+  "nineSlice":null,
+  "origin":9,
+  "parent":{
+    "name":"oBossShowerhead",
+    "path":"folders/Enemy/oBossShowerhead.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sBossShowerheadSlam",
+    "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":"sBossShowerheadSlam",
+    "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":"05716c78-1f90-40a4-bc59-d15f2c7271cd","path":"sprites/sBossShowerheadSlam/sBossShowerheadSlam.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"bfc9f501-9aa5-4620-8bb7-7cd13d500e02","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":235,
+    "yorigin":164,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":360,
+}

BIN
sprites/sBossShowerheadWindup/05716c78-1f90-40a4-bc59-d15f2c7271cd.png


BIN
sprites/sBossShowerheadWindup/layers/05716c78-1f90-40a4-bc59-d15f2c7271cd/f24b423d-90db-4b9e-8790-8dafbebd16f4.png


+ 90 - 0
sprites/sBossShowerheadWindup/sBossShowerheadWindup.yy

@@ -0,0 +1,90 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sBossShowerheadWindup",
+  "bboxMode":0,
+  "bbox_bottom":359,
+  "bbox_left":68,
+  "bbox_right":333,
+  "bbox_top":31,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"05716c78-1f90-40a4-bc59-d15f2c7271cd","name":"05716c78-1f90-40a4-bc59-d15f2c7271cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":360,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"f24b423d-90db-4b9e-8790-8dafbebd16f4","blendMode":0,"displayName":"default","isLocked":false,"name":"f24b423d-90db-4b9e-8790-8dafbebd16f4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sBossShowerheadWindup",
+  "nineSlice":null,
+  "origin":9,
+  "parent":{
+    "name":"oBossShowerhead",
+    "path":"folders/Enemy/oBossShowerhead.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sBossShowerheadWindup",
+    "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":"sBossShowerheadWindup",
+    "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":"05716c78-1f90-40a4-bc59-d15f2c7271cd","path":"sprites/sBossShowerheadWindup/sBossShowerheadWindup.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"bfc9f501-9aa5-4620-8bb7-7cd13d500e02","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":235,
+    "yorigin":164,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":360,
+}

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


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


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


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


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


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


+ 98 - 0
sprites/sEnemyShowerheadCharge/sEnemyShowerheadCharge.yy

@@ -0,0 +1,98 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sEnemyShowerheadCharge",
+  "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",},
+  ],
+  "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":"sEnemyShowerheadCharge",
+  "nineSlice":null,
+  "origin":4,
+  "parent":{
+    "name":"oEnemyShowerhead",
+    "path":"folders/Enemy/oEnemyShowerhead.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sEnemyShowerheadCharge",
+    "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":3.0,
+    "lockOrigin":false,
+    "moments":{
+      "$KeyframeStore<MomentsEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MomentsEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "name":"sEnemyShowerheadCharge",
+    "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/sEnemyShowerheadCharge/sEnemyShowerheadCharge.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/sEnemyShowerheadCharge/sEnemyShowerheadCharge.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/sEnemyShowerheadCharge/sEnemyShowerheadCharge.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,},
+          ],"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/sEnemyShowerheadEmerge/313d19ac-423c-4585-89d5-d727c8a6382e.png


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


BIN
sprites/sEnemyShowerheadEmerge/697d4062-25fd-4243-b315-0ac1140fd0b4.png


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


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


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


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


BIN
sprites/sEnemyShowerheadEmerge/layers/697d4062-25fd-4243-b315-0ac1140fd0b4/6b9701e4-db4a-44cb-947f-7ef6e92e0c3e.png


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


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


+ 106 - 0
sprites/sEnemyShowerheadEmerge/sEnemyShowerheadEmerge.yy

@@ -0,0 +1,106 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sEnemyShowerheadEmerge",
+  "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",},
+    {"$GMSpriteFrame":"v1","%Name":"697d4062-25fd-4243-b315-0ac1140fd0b4","name":"697d4062-25fd-4243-b315-0ac1140fd0b4","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":"sEnemyShowerheadEmerge",
+  "nineSlice":null,
+  "origin":4,
+  "parent":{
+    "name":"oEnemyShowerhead",
+    "path":"folders/Enemy/oEnemyShowerhead.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sEnemyShowerheadEmerge",
+    "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":5.0,
+    "lockOrigin":false,
+    "moments":{
+      "$KeyframeStore<MomentsEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MomentsEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "name":"sEnemyShowerheadEmerge",
+    "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/sEnemyShowerheadEmerge/sEnemyShowerheadEmerge.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/sEnemyShowerheadEmerge/sEnemyShowerheadEmerge.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/sEnemyShowerheadEmerge/sEnemyShowerheadEmerge.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/sEnemyShowerheadEmerge/sEnemyShowerheadEmerge.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,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"697d4062-25fd-4243-b315-0ac1140fd0b4","path":"sprites/sEnemyShowerheadEmerge/sEnemyShowerheadEmerge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"834dd670-6d63-4fcb-bb7b-130903cc227a","IsCreationKey":false,"Key":4.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/sEnemyShowerheadIdle/313d19ac-423c-4585-89d5-d727c8a6382e.png


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


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


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


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


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


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


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


+ 102 - 0
sprites/sEnemyShowerheadIdle/sEnemyShowerheadIdle.yy

@@ -0,0 +1,102 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sEnemyShowerheadIdle",
+  "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":"sEnemyShowerheadIdle",
+  "nineSlice":null,
+  "origin":4,
+  "parent":{
+    "name":"oEnemyShowerhead",
+    "path":"folders/Enemy/oEnemyShowerhead.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sEnemyShowerheadIdle",
+    "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":"sEnemyShowerheadIdle",
+    "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/sEnemyShowerheadIdle/sEnemyShowerheadIdle.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/sEnemyShowerheadIdle/sEnemyShowerheadIdle.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/sEnemyShowerheadIdle/sEnemyShowerheadIdle.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/sEnemyShowerheadIdle/sEnemyShowerheadIdle.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/sEnemyShowerheadRetreat/313d19ac-423c-4585-89d5-d727c8a6382e.png


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


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


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


+ 94 - 0
sprites/sEnemyShowerheadRetreat/sEnemyShowerheadRetreat.yy

@@ -0,0 +1,94 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sEnemyShowerheadRetreat",
+  "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",},
+  ],
+  "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":"sEnemyShowerheadRetreat",
+  "nineSlice":null,
+  "origin":4,
+  "parent":{
+    "name":"oEnemyShowerhead",
+    "path":"folders/Enemy/oEnemyShowerhead.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sEnemyShowerheadRetreat",
+    "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":2.0,
+    "lockOrigin":false,
+    "moments":{
+      "$KeyframeStore<MomentsEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MomentsEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "name":"sEnemyShowerheadRetreat",
+    "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/sEnemyShowerheadRetreat/sEnemyShowerheadRetreat.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/sEnemyShowerheadRetreat/sEnemyShowerheadRetreat.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,},
+          ],"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/sEnemyShowerheadSink/313d19ac-423c-4585-89d5-d727c8a6382e.png


Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff