Merge branch 'master' into dev-light-system

# Conflicts:
#	ddmyx.yyp
#	objects/oInGameManager/Step_0.gml
#	objects/oMain/Create_0.gml
#	objects/oMain/Step_0.gml
#	objects/oPlayer/Draw_0.gml
#	rooms/rTest_1/rTest_1.yy
#	rooms/rTest_2/rTest_2.yy

ddmyx.yyp

@@ -23,14 +23,16 @@
     {"$GMFolder":"","%Name":"Normal Map","folderPath":"folders/3rdParties/Bulb/Normal Map.yy","name":"Normal Map","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"Specular Map","folderPath":"folders/3rdParties/Bulb/Normal Map/Specular Map.yy","name":"Specular Map","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"CoreObjects","folderPath":"folders/CoreObjects.yy","name":"CoreObjects","resourceType":"GMFolder","resourceVersion":"2.0",},
+    {"$GMFolder":"","%Name":"Transition","folderPath":"folders/CoreObjects/Transition.yy","name":"Transition","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$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":"oEnemyCorpse","folderPath":"folders/Enemy/oEnemyCorpse.yy","name":"oEnemyCorpse","resourceType":"GMFolder","resourceVersion":"2.0",},
+    {"$GMFolder":"","%Name":"oEnemyHex","folderPath":"folders/Enemy/oBossHex/oEnemyHex.yy","name":"oEnemyHex","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":"oEnemyFlyingTrack2","folderPath":"folders/Enemy/oEnemyFlyingTrack2.yy","name":"oEnemyFlyingTrack2","resourceType":"GMFolder","resourceVersion":"2.0",},
+    {"$GMFolder":"","%Name":"oPlayerCorpse","folderPath":"folders/Enemy/oPlayerCorpse.yy","name":"oPlayerCorpse","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"ParticleEffects","folderPath":"folders/ParticleEffects.yy","name":"ParticleEffects","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"Player","folderPath":"folders/Player.yy","name":"Player","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"Hitbox","folderPath":"folders/Player/Hitbox.yy","name":"Hitbox","resourceType":"GMFolder","resourceVersion":"2.0",},
@@ -80,10 +82,12 @@
     {"id":{"name":"oEnemyFlying","path":"objects/oEnemyFlying/oEnemyFlying.yy",},},
     {"id":{"name":"oEnemyFlyingTrack","path":"objects/oEnemyFlyingTrack/oEnemyFlyingTrack.yy",},},
     {"id":{"name":"oEnemyFlyingTrack2","path":"objects/oEnemyFlyingTrack2/oEnemyFlyingTrack2.yy",},},
+    {"id":{"name":"oEnemyHex","path":"objects/oEnemyHex/oEnemyHex.yy",},},
     {"id":{"name":"oEnemyHitbox","path":"objects/oEnemyHitbox/oEnemyHitbox.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",},},
+    {"id":{"name":"oHitEnemyEffect","path":"objects/oHitEnemyEffect/oHitEnemyEffect.yy",},},
     {"id":{"name":"oInGameManager","path":"objects/oInGameManager/oInGameManager.yy",},},
     {"id":{"name":"oInteractIndicator","path":"objects/oInteractIndicator/oInteractIndicator.yy",},},
     {"id":{"name":"oInventory","path":"objects/oInventory/oInventory.yy",},},
@@ -98,18 +102,23 @@
     {"id":{"name":"oParentSolid","path":"objects/oParentSolid/oParentSolid.yy",},},
     {"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},},
     {"id":{"name":"oPlayerAfterImage","path":"objects/oPlayerAfterImage/oPlayerAfterImage.yy",},},
+    {"id":{"name":"oPlayerCorpse","path":"objects/oPlayerCorpse/oPlayerCorpse.yy",},},
     {"id":{"name":"oPlayerHitbox","path":"objects/oPlayerHitbox/oPlayerHitbox.yy",},},
     {"id":{"name":"oPlayerHitboxArc","path":"objects/oPlayerHitboxArc/oPlayerHitboxArc.yy",},},
     {"id":{"name":"oPlayerHitboxDown","path":"objects/oPlayerHitboxDown/oPlayerHitboxDown.yy",},},
     {"id":{"name":"oPlayerHitboxHor","path":"objects/oPlayerHitboxHor/oPlayerHitboxHor.yy",},},
     {"id":{"name":"oPlayerHitboxMark","path":"objects/oPlayerHitboxMark/oPlayerHitboxMark.yy",},},
     {"id":{"name":"oPlayerHitboxUp","path":"objects/oPlayerHitboxUp/oPlayerHitboxUp.yy",},},
+    {"id":{"name":"oRippleDeath","path":"objects/oRippleDeath/oRippleDeath.yy",},},
+    {"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":"oSlicedApple","path":"objects/oSlicedApple/oSlicedApple.yy",},},
     {"id":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},},
     {"id":{"name":"oUI","path":"objects/oUI/oUI.yy",},},
-    {"id":{"name":"peBladeHitEffect","path":"particles/peBladeHitEffect/peBladeHitEffect.yy",},},
+    {"id":{"name":"peBladeHitHazard","path":"particles/peBladeHitHazard/peBladeHitHazard.yy",},},
     {"id":{"name":"peINKBurst","path":"particles/peINKBurst/peINKBurst.yy",},},
+    {"id":{"name":"pePickupCredit","path":"particles/pePickupCredit/pePickupCredit.yy",},},
     {"id":{"name":"rTest_1","path":"rooms/rTest_1/rTest_1.yy",},},
     {"id":{"name":"rTest_2","path":"rooms/rTest_2/rTest_2.yy",},},
     {"id":{"name":"rTest_3","path":"rooms/rTest_3/rTest_3.yy",},},
@@ -152,6 +161,7 @@
     {"id":{"name":"BulbSpecularMapShaderSet","path":"scripts/BulbSpecularMapShaderSet/BulbSpecularMapShaderSet.yy",},},
     {"id":{"name":"BulbStaticOccluder","path":"scripts/BulbStaticOccluder/BulbStaticOccluder.yy",},},
     {"id":{"name":"BulbSunlight","path":"scripts/BulbSunlight/BulbSunlight.yy",},},
+    {"id":{"name":"BossHexAI","path":"scripts/BossHexAI/BossHexAI.yy",},},
     {"id":{"name":"CrawlAI","path":"scripts/CrawlAI/CrawlAI.yy",},},
     {"id":{"name":"DummyAI","path":"scripts/DummyAI/DummyAI.yy",},},
     {"id":{"name":"EnemyStates","path":"scripts/EnemyStates/EnemyStates.yy",},},
@@ -161,6 +171,7 @@
     {"id":{"name":"General","path":"scripts/General/General.yy",},},
     {"id":{"name":"HexAI","path":"scripts/HexAI/HexAI.yy",},},
     {"id":{"name":"Interaction","path":"scripts/Interaction/Interaction.yy",},},
+    {"id":{"name":"ParticleEffects","path":"scripts/ParticleEffects/ParticleEffects.yy",},},
     {"id":{"name":"PlayerStates","path":"scripts/PlayerStates/PlayerStates.yy",},},
     {"id":{"name":"Simplifier","path":"scripts/Simplifier/Simplifier.yy",},},
     {"id":{"name":"SL","path":"scripts/SL/SL.yy",},},
@@ -192,13 +203,13 @@
     {"id":{"name":"__shdBulbTonemapUncharted2","path":"shaders/__shdBulbTonemapUncharted2/__shdBulbTonemapUncharted2.yy",},},
     {"id":{"name":"__shdBulbTonemapUnreal3","path":"shaders/__shdBulbTonemapUnreal3/__shdBulbTonemapUnreal3.yy",},},
     {"id":{"name":"sh_flash","path":"shaders/sh_flash/sh_flash.yy",},},
+    {"id":{"name":"sh_grey","path":"shaders/sh_grey/sh_grey.yy",},},
     {"id":{"name":"sh_ink_blend","path":"shaders/sh_ink_blend/sh_ink_blend.yy",},},
     {"id":{"name":"__sprBulbPixel","path":"sprites/__sprBulbPixel/__sprBulbPixel.yy",},},
     {"id":{"name":"sBladeHitEffect","path":"sprites/sBladeHitEffect/sBladeHitEffect.yy",},},
     {"id":{"name":"sBlockClimbable","path":"sprites/sBlockClimbable/sBlockClimbable.yy",},},
     {"id":{"name":"sBlockSlippery","path":"sprites/sBlockSlippery/sBlockSlippery.yy",},},
     {"id":{"name":"sBossHex","path":"sprites/sBossHex/sBossHex.yy",},},
-    {"id":{"name":"sBossHexMask","path":"sprites/sBossHexMask/sBossHexMask.yy",},},
     {"id":{"name":"sBreakableSolid","path":"sprites/sBreakableSolid/sBreakableSolid.yy",},},
     {"id":{"name":"sCircle24","path":"sprites/sCircle24/sCircle24.yy",},},
     {"id":{"name":"sCircle8","path":"sprites/sCircle8/sCircle8.yy",},},
@@ -213,6 +224,7 @@
     {"id":{"name":"sEnemyFlying","path":"sprites/sEnemyFlying/sEnemyFlying.yy",},},
     {"id":{"name":"sEnemyFlyingTrack","path":"sprites/sEnemyFlyingTrack/sEnemyFlyingTrack.yy",},},
     {"id":{"name":"sEnemyFlyingTrackIdle","path":"sprites/sEnemyFlyingTrackIdle/sEnemyFlyingTrackIdle.yy",},},
+    {"id":{"name":"sEnemyHex","path":"sprites/sEnemyHex/sEnemyHex.yy",},},
     {"id":{"name":"sEnemyHitboxBC","path":"sprites/sEnemyHitboxBC/sEnemyHitboxBC.yy",},},
     {"id":{"name":"sEnemyHitboxMC","path":"sprites/sEnemyHitboxMC/sEnemyHitboxMC.yy",},},
     {"id":{"name":"sEnemyHitboxML","path":"sprites/sEnemyHitboxML/sEnemyHitboxML.yy",},},

objects/oBossHex/Create_0.gml

@@ -1,23 +1,52 @@
 event_inherited();
 
-hp = 1200;
+hp = 240;
 
-credit = 30;
+credit = 50;
 
 enemy_ai = hex_ai;
 
 hitbox = enemy_create_hitboxMC(160, 160);
 
-side_len = 125;
+side_len = 128;
 roll_spd = 0;
 roll_acc = 0;
 roll_angle = 0;
 
+dir = 0;
+acc = 0;
+spd = 0;
+x_acc = 0;
+y_acc = 0;
+
 pivot_x = 0;
 pivot_y = 0;
 
 state = "IDLE";
 
-mask_index = sBossHexMask;
+rebounce_timer = 0;
+
+angle_alter = 0;
+
+cnt = 0;
+
+last_attack = -1;
+
+depth = 10;
+
+base_y = 916;
 
-rebounce_timer = 0;
+death_callback = function()
+{
+	with(oEnemyHex)
+	{
+		x_spd_kb = choose(-1, 1) * 15;
+		y_spd_kb = 0;
+		enemy_death();
+	}
+	screen_shake(30);
+	global.time_scale_t = 0;
+	global.time_scale = 0.05;
+	global.camera.smooth = 0.1;
+	global.camera.follow = global.player;
+}

objects/oBossHex/Draw_0.gml

@@ -0,0 +1,4 @@
+// Inherit the parent event
+event_inherited();
+
+draw_text(200, 200, string(last_attack));

objects/oBossHex/Step_0.gml

@@ -5,10 +5,12 @@ image_index += animation_spd;
 
 enemy_ai();
 
-enemy_check_hitstun();
+x = clamp(x, 200, 1920 - 200 - 64);
 
-if state != "ROLL"
+if state != "IDLE"
 {
-	y_spd += global.g;
-	enemy_move_and_collide();
+	oCamera.x_to = 0;
+	oCamera.y_to = 0;
+	oCamera.smooth = 0.01;
+	oCamera.follow = noone;
 }

objects/oBossHex/oBossHex.yy

@@ -4,6 +4,7 @@
   "eventList":[
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
   ],
   "managed":true,
   "name":"oBossHex",

objects/oCamera/Create_0.gml

@@ -6,4 +6,6 @@ y_to = 0;
 
 smooth = 0.1;
 
-shake_magnitude = 0;
+shake_magnitude = 0;
+
+follow = global.player;

objects/oCamera/Step_0.gml

@@ -1,5 +1,3 @@
-follow = global.player;
-
 if instance_exists(follow)
 {
     x_to = follow.x;
@@ -13,8 +11,8 @@ if shake_magnitude < 1
 var _x_delta = random_range(-shake_magnitude, shake_magnitude);
 var _y_delta = random_range(-shake_magnitude, shake_magnitude);
 
-x += (x_to - x) * smooth + _x_delta;
-y += (y_to - y) * smooth + _y_delta;
+x += (x_to - x) * smooth * global.time_scale + _x_delta;
+y += (y_to - y) * smooth * global.time_scale + _y_delta;
 
 x = clamp(x, cam_width / 2, room_width - cam_width / 2) + _x_delta;
 y = clamp(y, cam_height / 2, room_height - cam_height / 2) + _y_delta;

objects/oCredit/Collision_oPlayer.gml

@@ -1,5 +1,7 @@
-if pickup_timer < 0
+if pickup_timer < 0 && flash_duration == 0
 {
+	flash_duration = 10;
 	global.save_data.player.Credit++;
-	instance_destroy();
+	var _part = part_system_create_layer("Instances", false, pePickupCredit);
+	part_system_position(_part, x, y);
 }

objects/oCredit/Create_0.gml

@@ -5,4 +5,8 @@ image_angle = random(360);
 
 restitution = 0.5; // 弹力系数
 
-pickup_timer = 20; // 最快拾取时间（可选）
+pickup_timer = 30; // 最快拾取时间（可选）
+
+flash_duration = 0;
+flash_timer = 0;
+u_flash_alpha = shader_get_uniform(sh_flash, "f_alpha");

objects/oCredit/Draw_0.gml

@@ -0,0 +1,13 @@
+if flash_duration > 0
+{
+    shader_set(sh_flash);
+    
+    var _alpha = flash_timer / flash_duration;
+    shader_set_uniform_f(u_flash_alpha, _alpha);
+ 
+    draw_self();
+    shader_reset();
+    
+    flash_timer += global.time_scale;
+}
+else draw_self();

objects/oCredit/Step_0.gml

@@ -25,4 +25,8 @@ x += x_spd;
 
 pickup_timer--;
 
-image_angle += 4 * point_distance(0, 0, x_spd, y_spd);
+image_angle += 4 * point_distance(0, 0, x_spd, y_spd);
+
+
+if flash_timer > flash_duration
+	instance_destroy();

objects/oCredit/oCredit.yy

@@ -5,6 +5,7 @@
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
     {"$GMEvent":"v1","%Name":"","collisionObjectId":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"eventNum":0,"eventType":4,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
   ],
   "managed":true,
   "name":"oCredit",

objects/oEnemyCorpse/Create_0.gml

@@ -1,5 +1,8 @@
-event_inherited();
+x_spd = 0;
+y_spd = 0;
 
-hp = 1;
+image_speed = 0;
 
-image_alpha = 0.6;
+restitution = 0.3;
+
+mask_index = sEnemyHitboxMC;

objects/oEnemyCorpse/Draw_0.gml

@@ -0,0 +1,17 @@
+/*
+var _ox = sprite_get_xoffset(sprite_index);
+var _oy = sprite_get_yoffset(sprite_index);
+var _cx = sprite_get_width(sprite_index) / 2;
+var _cy = sprite_get_height(sprite_index) / 2;
+
+shader_set(sh_grey);
+draw_sprite_ext(sprite_index, image_index,
+    x + lengthdir_x(_cx - _ox, image_angle),
+    y + lengthdir_y(_cy - _oy, image_angle),
+    image_xscale, image_yscale, image_angle, image_blend, image_alpha);
+shader_reset();
+*/
+
+shader_set(sh_grey);
+draw_self();
+shader_reset();

objects/oEnemyCorpse/Step_0.gml

@@ -0,0 +1,31 @@
+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);
+    
+    if y_spd > 2
+	{
+        y_spd *= -restitution;
+		x_spd *= restitution;
+	}
+	else
+	{
+        y_spd = 0;
+		x_spd = 0;
+	}
+}
+y += y_spd * global.time_scale;
+
+if place_meeting(x + x_spd, y, oParentSolid)
+    x_spd *= -restitution; // 撞墙反弹
+
+x += x_spd * global.time_scale;
+
+image_angle += point_distance(0, 0, x_spd, y_spd) * global.time_scale;
+
+image_alpha -= 0.001;
+
+if image_alpha <= 0
+	instance_destroy();

objects/oEnemyCorpse/oEnemyCorpse.yy

@@ -3,19 +3,17 @@
   "%Name":"oEnemyCorpse",
   "eventList":[
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
-    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":1,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
   ],
   "managed":true,
   "name":"oEnemyCorpse",
   "overriddenProperties":[],
   "parent":{
-    "name":"oEnemyCorpse",
-    "path":"folders/Enemy/oEnemyCorpse.yy",
-  },
-  "parentObjectId":{
-    "name":"oParentEnemy",
-    "path":"objects/oParentEnemy/oParentEnemy.yy",
+    "name":"Enemy",
+    "path":"folders/Enemy.yy",
   },
+  "parentObjectId":null,
   "persistent":false,
   "physicsAngularDamping":0.1,
   "physicsDensity":0.5,
@@ -33,10 +31,7 @@
   "resourceType":"GMObject",
   "resourceVersion":"2.0",
   "solid":false,
-  "spriteId":{
-    "name":"sPlayerIdle",
-    "path":"sprites/sPlayerIdle/sPlayerIdle.yy",
-  },
+  "spriteId":null,
   "spriteMaskId":null,
   "visible":true,
 }

objects/oEnemyCrawl/Create_0.gml

@@ -7,4 +7,4 @@ credit = 5;
 
 enemy_ai = enemy_crawl_ai;
 
-hitbox = enemy_create_hitboxBC(56, 56);
+hitbox = enemy_create_hitboxMC(56, 56);

objects/oEnemyDummy/Create_0.gml

@@ -7,7 +7,7 @@ enemy_ai = enemy_dummy_ai;
 
 state = "IDLE";
 
-hitbox = enemy_create_hitboxBC(88, 180);
+hitbox = enemy_create_hitboxMC(88, 180);
 hitbox.damage = 2;
 
 has_ink = false;

objects/oEnemyHex/Create_0.gml

@@ -0,0 +1,30 @@
+event_inherited();
+
+hp = 9;
+credit = 0;
+
+enemy_ai = enemy_hex_ai;
+
+hitbox = enemy_create_hitboxMC(40, 40);
+
+side_len = 30;
+roll_spd = 0;
+roll_acc = 0;
+roll_angle = 0;
+
+pivot_x = 0;
+pivot_y = 0;
+
+state = "SPAWN";
+
+//mask_index = sBossHexMask;
+x_spd = 0;
+y_spd = 0;
+y_acc = 0;
+enemy_spawn_init();
+
+rebounce_timer = 0;
+
+angle_alter = 0;
+
+base_y = 998;

objects/oEnemyHex/Step_0.gml

@@ -0,0 +1,8 @@
+if check_hitstop() || is_dead
+	exit;
+
+image_index += animation_spd;
+
+enemy_ai();
+
+x = clamp(x, 100, 1920 - 100 - 64);

objects/oEnemyHex/oEnemyHex.yy

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

objects/oEnemyHitbox/Create_0.gml

@@ -13,4 +13,6 @@ get_hit = function(_info)
 		global.hitstop = 12;
 		// se, pe...
 	}
-}
+}
+
+depth = 100;

objects/oFade/Create_0.gml

@@ -8,4 +8,4 @@ fade_in_time = 20;
 stay_time = 20;
 fade_out_time = 20;
 
-depth = -9999;
+depth = -10000;

objects/oFade/oFade.yy

@@ -10,8 +10,8 @@
   "name":"oFade",
   "overriddenProperties":[],
   "parent":{
-    "name":"CoreObjects",
-    "path":"folders/CoreObjects.yy",
+    "name":"Transition",
+    "path":"folders/CoreObjects/Transition.yy",
   },
   "parentObjectId":null,
   "persistent":true,

objects/oFocusEndEffect/Create_0.gml

@@ -9,4 +9,6 @@ dir = random(360);
 x_spd = lengthdir_x(spd, dir);
 y_spd = lengthdir_y(spd, dir);
 
-delay = random(10);
+delay = random(10);
+
+depth = 100;

objects/oHitEnemyEffect/Alarm_0.gml

@@ -0,0 +1 @@
+instance_destroy();

objects/oHitEnemyEffect/Create_0.gml

@@ -0,0 +1,14 @@
+image_blend = make_colour_hsv(170, 255, 128);
+
+base_scale = random_range(0.5, 1);
+
+spd = random_range(9, 15);
+
+dir = 0;
+
+x_spd = 0;
+y_spd = 0;
+
+delay = random_range(1, 6);
+
+depth = 100;

objects/oHitEnemyEffect/Step_0.gml

@@ -0,0 +1,27 @@
+if delay > 0
+{
+	delay--;
+	exit;
+}
+
+y_spd += global.g;
+
+dir = point_direction(0, 0, x_spd, y_spd);
+spd = point_distance(0, 0, x_spd, y_spd);
+
+image_angle = dir;
+
+var _stretch = spd * 0.02;
+
+image_xscale = base_scale * (1 + _stretch);
+image_yscale = base_scale / (1 + _stretch);
+
+if place_meeting(x, y + y_spd, oParentSolid)
+{
+	var _part = part_system_create_layer("Effect", false, peINKBurst);
+	part_system_position(_part, x, y);
+	instance_destroy();
+}
+
+x += x_spd;
+y += y_spd;

objects/oHitEnemyEffect/oHitEnemyEffect.yy

@@ -0,0 +1,40 @@
+{
+  "$GMObject":"",
+  "%Name":"oHitEnemyEffect",
+  "eventList":[
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
+  "managed":true,
+  "name":"oHitEnemyEffect",
+  "overriddenProperties":[],
+  "parent":{
+    "name":"ParticleEffects",
+    "path":"folders/ParticleEffects.yy",
+  },
+  "parentObjectId":null,
+  "persistent":false,
+  "physicsAngularDamping":0.1,
+  "physicsDensity":0.5,
+  "physicsFriction":0.2,
+  "physicsGroup":1,
+  "physicsKinematic":false,
+  "physicsLinearDamping":0.1,
+  "physicsObject":false,
+  "physicsRestitution":0.1,
+  "physicsSensor":false,
+  "physicsShape":1,
+  "physicsShapePoints":[],
+  "physicsStartAwake":true,
+  "properties":[],
+  "resourceType":"GMObject",
+  "resourceVersion":"2.0",
+  "solid":false,
+  "spriteId":{
+    "name":"sCircle24",
+    "path":"sprites/sCircle24/sCircle24.yy",
+  },
+  "spriteMaskId":null,
+  "visible":true,
+}

objects/oInGameManager/Create_0.gml

@@ -8,6 +8,8 @@ global.g = 0.5;
 // time relevant
 global.hitstop = 0;
 global.time_scale = 1.0;
+global.time_scale_t = 1.0;
+global.time_scale_duration = 180;
 
 // player status
 global.playerHP = global.save_data.player.maxHP;

objects/oInGameManager/Step_0.gml

@@ -12,4 +12,22 @@ if global.developer_mode
 
 // rendering
 // 每帧更新光照计算（处理动态光源和遮挡）
-global.bulb_renderer.Update();
+global.bulb_renderer.Update();
+if global.time_scale_t < 1.0
+{
+    global.time_scale_t += 1 / global.time_scale_duration;
+    global.time_scale_t = min(global.time_scale_t, 1.0);
+    
+    global.time_scale = lerp(0.1, 1.0, power(global.time_scale_t, 6));
+}
+
+if oMain._inventory
+{
+	global.inventory = icl(oInventory);
+	oMain.autoreg_handle("inventory", "inventory", 10);
+}
+else if oMain._close
+{
+	with(global.inventory) instance_destroy();
+	oMain.autodel_handle("inventory");
+}

objects/oMain/Create_0.gml

@@ -42,4 +42,18 @@ global.developer_mode = true;
 // save file
 global.save_data = {};
 global.save_filename = "ddmyx_save.dat";
-application_surface_draw_enable(false);
+application_surface_draw_enable(false);
+
+
+
+// title UI (BETA)
+menu_options = ["CONTINUE", "NEW GAME", "OPTIONS", "EXIT"];
+menu_index = 0;
+
+animation_timer = 0;
+lerp_speed = 0.15;
+
+for (var i = 0; i < array_length(menu_options); i++)
+    option_scale[i] = 1;
+
+favour_text = choose("这是一条风味文本");

objects/oMain/Draw_64.gml

@@ -1,3 +1,4 @@
+/*
 if global.developer_mode && room == rTitle
 {
 	draw_set_font(fTest);
@@ -7,4 +8,40 @@ if global.developer_mode && room == rTitle
 	draw_text(0, 144, "vk_enter FUNCTIONS AS CONTINUE, LOADING YOUR CURRENT SAVE FILE");
 	draw_text(0, 192, "vk_escape FUNCTIONS AS QUIT GAME");
 	draw_text(0, 240, "vk_escape WILL SAVE THE GAME AND RETURN YOU TO TITLE ROOM WHILE IN GAME");
-}
+}
+*/
+if room != rTitle
+	exit;
+
+draw_set_halign(fa_center);
+draw_set_valign(fa_middle);
+draw_set_colour(c_white);
+draw_set_font(fTest);
+var _cx = room_width / 2;
+var _cy = room_height / 2;
+
+draw_rectangle_colour(0, 0, room_width, room_height, c_black, c_black, #5a5a5a, #4a4a4a, false);
+
+var _title_text = "ddmyx BETA";
+
+draw_text_transformed(_cx, _cy - 160, _title_text, 2, 2, 0);
+
+var _spacing = 60;
+
+for (var i = 0; i < array_length(menu_options); i++) {
+    var _opt_y = _cy + (i * _spacing);
+    var _is_selected = (i == menu_index);
+
+    var _text = menu_options[i];
+    var _col = _is_selected ? c_white : c_gray;
+    var _s = option_scale[i];
+    
+    if _is_selected
+	{
+        var _wave = abs(sin(animation_timer * 2)) * 5;
+        draw_text(_cx - 180 - _wave, _opt_y, ">");
+        draw_text(_cx + 180 + _wave, _opt_y, "<");
+    }
+    draw_text_transformed_colour(_cx, _opt_y, _text, _s, _s, 0, _col, _col, _col, _col, 1);
+}
+draw_text(_cx, _cy + 320, favour_text);

objects/oParentEnemy/Create_0.gml

@@ -1,7 +1,28 @@
 get_hit = function(_info)
 {
 	if has_ink
+	{
 		player_add_INK(1);
+		
+		var _dir = point_direction(0, 0, _info.kbFactorX, -abs(_info.kbFactorY));
+		repeat(6)
+		{
+			var _pe = icl(oHitEnemyEffect);
+			_pe.dir = random_range(_dir - 45, _dir + 45);
+			_pe.x_spd = lengthdir_x(_pe.spd, _pe.dir);
+			_pe.y_spd = lengthdir_y(_pe.spd, _pe.dir);
+		}
+	}
+	else
+	{
+		var _struct = particle_get_info(peBladeHitHazard);
+		var _part_type = _struct.emitters[0].parttype.ind;
+		var _dir = point_direction(0, 0, _info.kbFactorX, -abs(_info.kbFactorY));
+		part_type_direction(_part_type, _dir - 45, _dir + 45, 0, 5);
+    
+		var _part = part_system_create_layer("Effect", false, peBladeHitHazard);
+		part_system_position(_part, x, y);
+	}
 	
 	flash_timer = 6;
 	flash_duration = 6;
@@ -16,7 +37,7 @@ get_hit = function(_info)
     if hp <= 0
 	{
         is_dead = true;
-        instance_destroy();
+        enemy_death();
     }
 };
 
@@ -42,6 +63,7 @@ is_dead = false;
 state = undefined;
 
 enemy_ai = function(){};
+death_callback = function(){};
 
 animation_spd = 0.25;
 image_speed = 0;

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));
 }

objects/oParentHazard/Create_0.gml

@@ -2,7 +2,12 @@ damage = 1;
 
 get_hit = function(_info)
 {
-	return;
-	//pe
+    var _struct = particle_get_info(peBladeHitHazard);
+    var _part_type = _struct.emitters[0].parttype.ind;
+    var _dir = point_direction(0, 0, -_info.kbFactorX, -_info.kbFactorY);
+    part_type_direction(_part_type, _dir - 45, _dir + 45, 0, 5);
+    
+    var _part = part_system_create_layer("Effect", false, peBladeHitHazard);
+    part_system_position(_part, x, y);
 	//se
 };

objects/oPlayer/Other_4.gml

@@ -1,3 +1,6 @@
+last_safe_x = x;
+last_safe_y = y;
+
 if global.target_door_id != -1
 {
     with(oDoor)
@@ -27,10 +30,12 @@ else
 			global.player.y = y;
 		}
 	}
+	oCamera.smooth = 0.1;
+	oCamera.follow = self;
 	camera_snap();
 }
 
 if global.save_data.player.corpse.targetRoom == room
-	icl(oEnemyCorpse,
+	icl(oPlayerCorpse,
 	global.save_data.player.corpse.xPos,
 	global.save_data.player.corpse.yPos);

objects/oPlayerAfterImage/Create_0.gml

@@ -0,0 +1 @@
+depth = 100;

objects/oPlayerAfterImage/oPlayerAfterImage.yy

@@ -3,6 +3,7 @@
   "%Name":"oPlayerAfterImage",
   "eventList":[
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
   ],
   "managed":true,
   "name":"oPlayerAfterImage",

objects/oPlayerCorpse/Create_0.gml

@@ -0,0 +1,5 @@
+event_inherited();
+
+hp = 1;
+
+image_alpha = 0.6;

objects/oPlayerCorpse/oPlayerCorpse.yy

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

objects/oPlayerHitbox/Create_0.gml

@@ -11,8 +11,8 @@ feedback_activated = false;
 hit_feedback = function(_owner, _inst){};
 hit_info = {
 	damage: 1,
-	kbFactorX: 1.0,
-	kbFactorY: 1.0,
+	kbFactorX: 0.0,
+	kbFactorY: 0.0,
 	sourceX: -1,
 	sourceY: -1
 };
@@ -20,4 +20,6 @@ hit_info = {
 if global.developer_mode
 	image_blend = c_red;
 else
-	image_alpha = 0;
+	image_alpha = 0;
+	
+depth = 101;

objects/oRippleDeath/Create_0.gml

@@ -0,0 +1,8 @@
+radius_outer = 0;
+radius_inner = -2160;
+
+expand_speed = 32;
+
+max_radius = sqrt(sqr(room_width) + sqr(room_height));
+
+depth = -1000;

objects/oRippleDeath/Draw_64.gml

@@ -0,0 +1,12 @@
+draw_set_circle_precision(128); 
+
+gpu_set_blendmode_ext(bm_inv_dest_color, bm_zero);
+
+if (radius_outer > 0)
+    draw_circle_color(x, y, radius_outer, c_white, c_white, false);
+
+
+if (radius_inner > 0)
+    draw_circle_color(x, y, radius_inner, c_black, c_black, false);
+	
+gpu_set_blendmode(bm_normal);

objects/oRippleDeath/Step_0.gml

@@ -0,0 +1,5 @@
+radius_outer += expand_speed;
+radius_inner += expand_speed;
+
+if radius_inner > max_radius
+	instance_destroy();

objects/oRippleDeath/oRippleDeath.yy

@@ -0,0 +1,37 @@
+{
+  "$GMObject":"",
+  "%Name":"oRippleDeath",
+  "eventList":[
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
+  "managed":true,
+  "name":"oRippleDeath",
+  "overriddenProperties":[],
+  "parent":{
+    "name":"Transition",
+    "path":"folders/CoreObjects/Transition.yy",
+  },
+  "parentObjectId":null,
+  "persistent":false,
+  "physicsAngularDamping":0.1,
+  "physicsDensity":0.5,
+  "physicsFriction":0.2,
+  "physicsGroup":1,
+  "physicsKinematic":false,
+  "physicsLinearDamping":0.1,
+  "physicsObject":false,
+  "physicsRestitution":0.1,
+  "physicsSensor":false,
+  "physicsShape":1,
+  "physicsShapePoints":[],
+  "physicsStartAwake":true,
+  "properties":[],
+  "resourceType":"GMObject",
+  "resourceVersion":"2.0",
+  "solid":false,
+  "spriteId":null,
+  "spriteMaskId":null,
+  "visible":true,
+}

objects/oRippleExpand/Create_0.gml

@@ -0,0 +1,8 @@
+r_in = 0;
+r_out = sqrt(sqr(room_width) + sqr(room_height));
+
+expand_speed = 32;
+depth = -10000;
+
+ui_x = 0;
+ui_y = 0;

objects/oRippleExpand/Draw_64.gml

@@ -0,0 +1,16 @@
+draw_set_color(c_black);
+draw_set_alpha(1.0);
+
+var _segments = 64;
+draw_primitive_begin(pr_trianglestrip);
+
+for(var i = 0; i <= _segments; i++)
+{
+    var _angle = i * (360 / _segments);
+    var _dx = dcos(_angle);
+    var _dy = dsin(_angle);
+    draw_vertex(ui_x + _dx * r_out, ui_y - _dy * r_out);
+    draw_vertex(ui_x + _dx * max(0, r_in), ui_y - _dy * max(0, r_in));
+}
+
+draw_primitive_end();

objects/oRippleExpand/Step_0.gml

@@ -0,0 +1,4 @@
+r_in += expand_speed;
+
+if (r_in > r_out)
+    instance_destroy();

objects/oRippleExpand/oRippleExpand.yy

@@ -0,0 +1,37 @@
+{
+  "$GMObject":"",
+  "%Name":"oRippleExpand",
+  "eventList":[
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
+  "managed":true,
+  "name":"oRippleExpand",
+  "overriddenProperties":[],
+  "parent":{
+    "name":"Transition",
+    "path":"folders/CoreObjects/Transition.yy",
+  },
+  "parentObjectId":null,
+  "persistent":true,
+  "physicsAngularDamping":0.1,
+  "physicsDensity":0.5,
+  "physicsFriction":0.2,
+  "physicsGroup":1,
+  "physicsKinematic":false,
+  "physicsLinearDamping":0.1,
+  "physicsObject":false,
+  "physicsRestitution":0.1,
+  "physicsSensor":false,
+  "physicsShape":1,
+  "physicsShapePoints":[],
+  "physicsStartAwake":true,
+  "properties":[],
+  "resourceType":"GMObject",
+  "resourceVersion":"2.0",
+  "solid":false,
+  "spriteId":null,
+  "spriteMaskId":null,
+  "visible":true,
+}

objects/oRippleShrink/Create_0.gml

@@ -0,0 +1,8 @@
+r_in = sqrt(sqr(room_width) + sqr(room_height)) / 1.6;
+r_out = sqrt(sqr(room_width) + sqr(room_height)) / 1.6;
+shrink_speed = 24;
+is_finished = false;
+
+callback = function(){};
+
+depth = -10000;

objects/oRippleShrink/Draw_64.gml

@@ -0,0 +1,17 @@
+draw_set_color(c_black);
+draw_set_alpha(1.0);
+
+var _segments = 48;
+draw_primitive_begin(pr_trianglestrip);
+
+for(var i = 0; i <= _segments; i++)
+{
+    var _angle = i * (360 / _segments);
+    var _dx = dcos(_angle);
+    var _dy = dsin(_angle);
+    
+    draw_vertex(x + _dx * r_out, y - _dy * r_out);
+    draw_vertex(x + _dx * r_in,  y - _dy * r_in);
+}
+
+draw_primitive_end();

objects/oRippleShrink/Step_0.gml

@@ -0,0 +1,11 @@
+if !is_finished
+{
+    r_in -= shrink_speed;
+    
+    if r_in <= 0
+	{
+        r_in = 0;
+        is_finished = true;
+        callback();
+    }
+}

objects/oRippleShrink/oRippleShrink.yy

@@ -0,0 +1,39 @@
+{
+  "$GMObject":"",
+  "%Name":"oRippleShrink",
+  "eventList":[
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
+  "managed":true,
+  "name":"oRippleShrink",
+  "overriddenProperties":[],
+  "parent":{
+    "name":"Transition",
+    "path":"folders/CoreObjects/Transition.yy",
+  },
+  "parentObjectId":null,
+  "persistent":false,
+  "physicsAngularDamping":0.1,
+  "physicsDensity":0.5,
+  "physicsFriction":0.2,
+  "physicsGroup":1,
+  "physicsKinematic":false,
+  "physicsLinearDamping":0.1,
+  "physicsObject":false,
+  "physicsRestitution":0.1,
+  "physicsSensor":false,
+  "physicsShape":1,
+  "physicsShapePoints":[],
+  "physicsStartAwake":true,
+  "properties":[
+    {"$GMObjectProperty":"v2","%Name":"gotoroom","filters":[],"listItems":[],"multiselect":false,"name":"gotoroom","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"","varType":4,},
+  ],
+  "resourceType":"GMObject",
+  "resourceVersion":"2.0",
+  "solid":false,
+  "spriteId":null,
+  "spriteMaskId":null,
+  "visible":true,
+}

particles/peBladeHitEffect/peBladeHitEffect.yy

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

particles/peBladeHitHazard/peBladeHitHazard.yy

@@ -0,0 +1,25 @@
+{
+  "$GMParticleSystem":"",
+  "%Name":"peBladeHitHazard",
+  "backdropHeight":768,
+  "backdropImageOpacity":0.5,
+  "backdropImagePath":"",
+  "backdropWidth":1366,
+  "backdropXOffset":0.0,
+  "backdropYOffset":0.0,
+  "drawOrder":0,
+  "emitters":[
+    {"$GMPSEmitter":"","%Name":"Emitter","additiveBlend":false,"directionIncrease":0.0,"directionMax":120.0,"directionMin":60.0,"directionWiggle":0.0,"distribution":0,"editorColour":1090519039,"editorDrawShape":true,"emitCount":12,"emitDelayMax":0.0,"emitDelayMin":0.0,"emitDelayUnits":0,"emitIntervalMax":0.0,"emitIntervalMin":0.0,"emitIntervalUnits":0,"enabled":true,"endColour":4281515007,"GMPresetName":null,"gravityDirection":270.0,"gravityForce":0.6,"headPosition":0.0,"lifetimeMax":60.0,"lifetimeMin":45.0,"linkedEmitter":null,"locked":false,"midColour":4281532415,"mode":1,"name":"Emitter","orientationIncrease":0.0,"orientationMax":0.0,"orientationMin":0.0,"orientationRelative":true,"orientationWiggle":0.0,"regionH":64.0,"regionW":64.0,"regionX":0.0,"regionY":0.0,"resourceType":"GMPSEmitter","resourceVersion":"2.0","scaleX":0.4,"scaleY":1.0,"shape":0,"sizeIncrease":0.0,"sizeMax":0.5,"sizeMin":0.3,"sizeWiggle":0.0,"spawnOnDeathCount":1,"spawnOnDeathGMPreset":null,"spawnOnDeathId":null,"spawnOnUpdateCount":1,"spawnOnUpdateGMPreset":null,"spawnOnUpdateId":null,"speedIncrease":0.0,"speedMax":15.0,"speedMin":12.0,"speedWiggle":0.0,"spriteAnimate":false,"spriteId":null,"spriteRandom":false,"spriteStretch":true,"startColour":4291624959,"texture":3,},
+  ],
+  "name":"peBladeHitHazard",
+  "parent":{
+    "name":"ParticleEffects",
+    "path":"folders/ParticleEffects.yy",
+  },
+  "resourceType":"GMParticleSystem",
+  "resourceVersion":"2.0",
+  "showBackdrop":true,
+  "showBackdropImage":false,
+  "xorigin":0,
+  "yorigin":0,
+}

particles/pePickupCredit/pePickupCredit.yy

@@ -0,0 +1,25 @@
+{
+  "$GMParticleSystem":"",
+  "%Name":"pePickupCredit",
+  "backdropHeight":768,
+  "backdropImageOpacity":0.5,
+  "backdropImagePath":"",
+  "backdropWidth":1366,
+  "backdropXOffset":0.0,
+  "backdropYOffset":0.0,
+  "drawOrder":0,
+  "emitters":[
+    {"$GMPSEmitter":"","%Name":"Emitter","additiveBlend":false,"directionIncrease":0.0,"directionMax":360.0,"directionMin":0.0,"directionWiggle":0.0,"distribution":0,"editorColour":1090519039,"editorDrawShape":true,"emitCount":1,"emitDelayMax":0.0,"emitDelayMin":0.0,"emitDelayUnits":0,"emitIntervalMax":0.0,"emitIntervalMin":0.0,"emitIntervalUnits":0,"enabled":true,"endColour":16777215,"GMPresetName":null,"gravityDirection":270.0,"gravityForce":0.0,"headPosition":0.0,"lifetimeMax":24.0,"lifetimeMin":24.0,"linkedEmitter":null,"locked":false,"midColour":4294967295,"mode":1,"name":"Emitter","orientationIncrease":0.0,"orientationMax":0.0,"orientationMin":0.0,"orientationRelative":false,"orientationWiggle":0.0,"regionH":0.0,"regionW":0.0,"regionX":0.0,"regionY":0.0,"resourceType":"GMPSEmitter","resourceVersion":"2.0","scaleX":1.0,"scaleY":1.0,"shape":0,"sizeIncrease":0.0,"sizeMax":1.0,"sizeMin":1.0,"sizeWiggle":0.0,"spawnOnDeathCount":1,"spawnOnDeathGMPreset":null,"spawnOnDeathId":null,"spawnOnUpdateCount":1,"spawnOnUpdateGMPreset":null,"spawnOnUpdateId":null,"speedIncrease":0.0,"speedMax":0.0,"speedMin":0.0,"speedWiggle":0.0,"spriteAnimate":false,"spriteId":null,"spriteRandom":false,"spriteStretch":true,"startColour":2164260863,"texture":8,},
+  ],
+  "name":"pePickupCredit",
+  "parent":{
+    "name":"ParticleEffects",
+    "path":"folders/ParticleEffects.yy",
+  },
+  "resourceType":"GMParticleSystem",
+  "resourceVersion":"2.0",
+  "showBackdrop":true,
+  "showBackdropImage":false,
+  "xorigin":0,
+  "yorigin":0,
+}

rooms/rTest_1/rTest_1.yy

@@ -96,8 +96,6 @@
     {"name":"inst_409D4AF3","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_9B86AF8","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_2DED3B8D","path":"rooms/rTest_1/rTest_1.yy",},
-    {"name":"inst_598B14B9","path":"rooms/rTest_1/rTest_1.yy",},
-    {"name":"inst_26EF4519","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_3850BA5B","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_6D68E23B","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_100927D7","path":"rooms/rTest_1/rTest_1.yy",},
@@ -531,15 +529,23 @@
     {"name":"inst_1D07E405","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_1CC1B9E2","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_21BB4332","path":"rooms/rTest_1/rTest_1.yy",},
-    {"name":"inst_91B383D","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_5480E723","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_19F41D73","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_50E073CD","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_273279C9","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_4AB26584","path":"rooms/rTest_1/rTest_1.yy",},
-    {"name":"inst_2ED086A7","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_31F5D3B9","path":"rooms/rTest_1/rTest_1.yy",},
     {"name":"inst_176C6E74","path":"rooms/rTest_1/rTest_1.yy",},
+    {"name":"inst_91B383D","path":"rooms/rTest_1/rTest_1.yy",},
+    {"name":"inst_54F324A","path":"rooms/rTest_1/rTest_1.yy",},
+    {"name":"inst_10AF4E7F","path":"rooms/rTest_1/rTest_1.yy",},
+    {"name":"inst_20AE5E03","path":"rooms/rTest_1/rTest_1.yy",},
+    {"name":"inst_5CC87C97","path":"rooms/rTest_1/rTest_1.yy",},
+    {"name":"inst_7534D132","path":"rooms/rTest_1/rTest_1.yy",},
+    {"name":"inst_2EB4F1E6","path":"rooms/rTest_1/rTest_1.yy",},
+    {"name":"inst_1D1CDBCD","path":"rooms/rTest_1/rTest_1.yy",},
+    {"name":"inst_554F996B","path":"rooms/rTest_1/rTest_1.yy",},
+    {"name":"inst_5E1AF5F8","path":"rooms/rTest_1/rTest_1.yy",},
   ],
   "isDnd":false,
   "layers":[
@@ -574,7 +580,7 @@
         {"$GMRInstance":"v4","%Name":"inst_15C6A01B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_15C6A01B","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2464.0,"y":480.0,},
         {"$GMRInstance":"v4","%Name":"inst_579C959D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_579C959D","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2464.0,"y":544.0,},
         {"$GMRInstance":"v4","%Name":"inst_364B45A3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_364B45A3","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2528.0,"y":544.0,},
-        {"$GMRInstance":"v4","%Name":"inst_671EBBB6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_671EBBB6","objectId":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2208.0,"y":1248.0,},
+        {"$GMRInstance":"v4","%Name":"inst_671EBBB6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_671EBBB6","objectId":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2208.0,"y":1216.0,},
         {"$GMRInstance":"v4","%Name":"inst_12F4B9BE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_12F4B9BE","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2080.0,"y":544.0,},
         {"$GMRInstance":"v4","%Name":"inst_26A22440","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_26A22440","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2144.0,"y":544.0,},
         {"$GMRInstance":"v4","%Name":"inst_7B434A90","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7B434A90","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2208.0,"y":544.0,},
@@ -634,8 +640,6 @@
         {"$GMRInstance":"v4","%Name":"inst_409D4AF3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_409D4AF3","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3776.0,"y":928.0,},
         {"$GMRInstance":"v4","%Name":"inst_9B86AF8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9B86AF8","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3776.0,"y":864.0,},
         {"$GMRInstance":"v4","%Name":"inst_2DED3B8D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2DED3B8D","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3776.0,"y":800.0,},
-        {"$GMRInstance":"v4","%Name":"inst_598B14B9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_598B14B9","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3776.0,"y":736.0,},
-        {"$GMRInstance":"v4","%Name":"inst_26EF4519","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_26EF4519","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3776.0,"y":672.0,},
         {"$GMRInstance":"v4","%Name":"inst_3850BA5B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3850BA5B","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3776.0,"y":544.0,},
         {"$GMRInstance":"v4","%Name":"inst_6D68E23B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6D68E23B","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3776.0,"y":608.0,},
         {"$GMRInstance":"v4","%Name":"inst_100927D7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_100927D7","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3776.0,"y":480.0,},
@@ -957,7 +961,7 @@
         {"$GMRInstance":"v4","%Name":"inst_705C2C52","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_705C2C52","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2592.0,"y":1056.0,},
         {"$GMRInstance":"v4","%Name":"inst_28E6166C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_28E6166C","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2592.0,"y":992.0,},
         {"$GMRInstance":"v4","%Name":"inst_5222DDD3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5222DDD3","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2528.0,"y":992.0,},
-        {"$GMRInstance":"v4","%Name":"inst_326EF6AA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_326EF6AA","objectId":{"name":"oEnemyDummy","path":"objects/oEnemyDummy/oEnemyDummy.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1552.0,"y":1536.0,},
+        {"$GMRInstance":"v4","%Name":"inst_326EF6AA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_326EF6AA","objectId":{"name":"oEnemyDummy","path":"objects/oEnemyDummy/oEnemyDummy.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1536.0,"y":1440.0,},
         {"$GMRInstance":"v4","%Name":"inst_151D8788","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_151D8788","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2304.0,"y":1408.0,},
         {"$GMRInstance":"v4","%Name":"inst_44460AA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_44460AA","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2240.0,"y":1408.0,},
         {"$GMRInstance":"v4","%Name":"inst_71DD9757","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_71DD9757","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2176.0,"y":1408.0,},
@@ -980,7 +984,7 @@
         {"$GMRInstance":"v4","%Name":"inst_7A113AF5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7A113AF5","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3008.0,"y":1568.0,},
         {"$GMRInstance":"v4","%Name":"inst_5966B69F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5966B69F","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2528.0,"y":1120.0,},
         {"$GMRInstance":"v4","%Name":"inst_34BCE1CA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_34BCE1CA","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2592.0,"y":1120.0,},
-        {"$GMRInstance":"v4","%Name":"inst_574F2C78","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_574F2C78","objectId":{"name":"oEnemyDummy","path":"objects/oEnemyDummy/oEnemyDummy.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2944.0,"y":1536.0,},
+        {"$GMRInstance":"v4","%Name":"inst_574F2C78","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_574F2C78","objectId":{"name":"oEnemyDummy","path":"objects/oEnemyDummy/oEnemyDummy.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2880.0,"y":1440.0,},
         {"$GMRInstance":"v4","%Name":"inst_75816379","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_75816379","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3456.0,"y":1504.0,},
         {"$GMRInstance":"v4","%Name":"inst_25B34436","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_25B34436","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3456.0,"y":1440.0,},
         {"$GMRInstance":"v4","%Name":"inst_C1C7A79","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C1C7A79","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3456.0,"y":1376.0,},
@@ -1088,6 +1092,16 @@
         {"$GMRInstance":"v4","%Name":"inst_2ED086A7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2ED086A7","objectId":{"name":"oEnemyFlyingTrack","path":"objects/oEnemyFlyingTrack/oEnemyFlyingTrack.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3584.0,"y":1184.0,},
         {"$GMRInstance":"v4","%Name":"inst_31F5D3B9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_31F5D3B9","objectId":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":1536.0,},
         {"$GMRInstance":"v4","%Name":"inst_176C6E74","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_176C6E74","objectId":{"name":"oLight","path":"objects/oLight/oLight.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":960.0,},
+        {"$GMRInstance":"v4","%Name":"inst_31F5D3B9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_31F5D3B9","objectId":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":1504.0,},
+        {"$GMRInstance":"v4","%Name":"inst_54F324A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_54F324A","objectId":{"name":"oEnemyDummy","path":"objects/oEnemyDummy/oEnemyDummy.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3648.0,"y":1120.0,},
+        {"$GMRInstance":"v4","%Name":"inst_10AF4E7F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_10AF4E7F","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3776.0,"y":736.0,},
+        {"$GMRInstance":"v4","%Name":"inst_20AE5E03","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_20AE5E03","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3776.0,"y":672.0,},
+        {"$GMRInstance":"v4","%Name":"inst_5CC87C97","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5CC87C97","objectId":{"name":"oEnemyDummy","path":"objects/oEnemyDummy/oEnemyDummy.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3296.0,"y":544.0,},
+        {"$GMRInstance":"v4","%Name":"inst_7534D132","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7534D132","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3328.0,"y":672.0,},
+        {"$GMRInstance":"v4","%Name":"inst_2EB4F1E6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2EB4F1E6","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3264.0,"y":672.0,},
+        {"$GMRInstance":"v4","%Name":"inst_1D1CDBCD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1D1CDBCD","objectId":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3296.0,"y":1504.0,},
+        {"$GMRInstance":"v4","%Name":"inst_554F996B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_554F996B","objectId":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3488.0,"y":1184.0,},
+        {"$GMRInstance":"v4","%Name":"inst_5E1AF5F8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5E1AF5F8","objectId":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2688.0,"y":1504.0,},
       ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,},
     {"$GMREffectLayer":"","%Name":"Effect","depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Effect","properties":[],"resourceType":"GMREffectLayer","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,},

rooms/rTest_2/rTest_2.yy

@@ -63,22 +63,8 @@
     {"name":"inst_2F8EED7","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_1DD1A367","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_1BC1E2","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_5409E19","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_6021AEAC","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_3FD6E44A","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_7483B109","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_29D26FB4","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_1B5CBE5B","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_1CBFEE88","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_3BC62543","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_68D85792","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_29BD5360","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_8083626","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_116D1480","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_23E614AB","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_7E447A91","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_698457D9","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_2E94E80C","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_6E887A6C","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_116B582C","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_1BC019CB","path":"rooms/rTest_2/rTest_2.yy",},
@@ -220,16 +206,6 @@
     {"name":"inst_4F3119F","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_76463EFD","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_4AC447C4","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_59D3FEA7","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_1A32ADC7","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_32722A14","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_454C0F49","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_48523220","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_5638A6C6","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_58385899","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_5E8F3468","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_941640C","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_BE93B3B","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_401B8E5F","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_536AC3E1","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_D17D725","path":"rooms/rTest_2/rTest_2.yy",},
@@ -312,10 +288,8 @@
     {"name":"inst_47F1834E","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_559173DD","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_4CCC4FEB","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_1E9219BF","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_1A6B289E","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_6036B3C5","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_263D7F10","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_3F8070DB","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_1D5AC58A","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_6888A2E1","path":"rooms/rTest_2/rTest_2.yy",},
@@ -340,8 +314,6 @@
     {"name":"inst_68439918","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_5AA8FB58","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_2C64A7D0","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_4966C24E","path":"rooms/rTest_2/rTest_2.yy",},
-    {"name":"inst_31CF909E","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_1EAF294","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_376FC12","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_467D4752","path":"rooms/rTest_2/rTest_2.yy",},
@@ -429,6 +401,31 @@
     {"name":"inst_22DC81BE","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_53FEE36C","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_40F8F49B","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_44D01C07","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_5D4C200E","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_6855FE9","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_5D4D85F4","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_47E7530A","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_4E04F30B","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_6C016F13","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_6F6096B4","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_4403CB47","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_17F85CC1","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_56F5A8C3","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_7A6B505C","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_21427454","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_4818E793","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_47FEC885","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_2E6E7435","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_1F04B4FD","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_5817553F","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_55FA84BE","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_67D609E1","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_3238BFD2","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_2E93C550","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_226C4EF4","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_67606ED9","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_52E3ECA1","path":"rooms/rTest_2/rTest_2.yy",},
   ],
   "isDnd":false,
   "layers":[
@@ -480,18 +477,10 @@
         {"$GMRInstance":"v4","%Name":"inst_65F145CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_65F145CC","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":992.0,},
         {"$GMRInstance":"v4","%Name":"inst_2F685D8C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2F685D8C","objectId":{"name":"oBreakableSolid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"properties":[
             {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oBreakableSolid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"propertyId":{"name":"uuid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"rTest2_bs2",},
-          ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":-90.0,"scaleX":1.0,"scaleY":1.0,"x":3392.0,"y":576.0,},
+          ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":-90.0,"scaleX":1.0,"scaleY":1.0,"x":3392.0,"y":544.0,},
         {"$GMRInstance":"v4","%Name":"inst_4FEA3227","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4FEA3227","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":608.0,},
         {"$GMRInstance":"v4","%Name":"inst_4161E055","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4161E055","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":544.0,},
         {"$GMRInstance":"v4","%Name":"inst_29128C7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_29128C7","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":480.0,},
-        {"$GMRInstance":"v4","%Name":"inst_5409E19","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5409E19","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":480.0,},
-        {"$GMRInstance":"v4","%Name":"inst_6021AEAC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6021AEAC","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":416.0,},
-        {"$GMRInstance":"v4","%Name":"inst_3FD6E44A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3FD6E44A","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":352.0,},
-        {"$GMRInstance":"v4","%Name":"inst_7483B109","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7483B109","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":288.0,},
-        {"$GMRInstance":"v4","%Name":"inst_29D26FB4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_29D26FB4","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":224.0,},
-        {"$GMRInstance":"v4","%Name":"inst_1B5CBE5B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1B5CBE5B","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":160.0,},
-        {"$GMRInstance":"v4","%Name":"inst_1CBFEE88","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1CBFEE88","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":96.0,},
-        {"$GMRInstance":"v4","%Name":"inst_3BC62543","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3BC62543","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":32.0,},
         {"$GMRInstance":"v4","%Name":"inst_2F13E9BB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2F13E9BB","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":1632.0,},
         {"$GMRInstance":"v4","%Name":"inst_31820EE4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_31820EE4","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3232.0,"y":1632.0,},
         {"$GMRInstance":"v4","%Name":"inst_42D3022E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_42D3022E","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3296.0,"y":1632.0,},
@@ -514,12 +503,6 @@
         {"$GMRInstance":"v4","%Name":"inst_1BC1E2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1BC1E2","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3680.0,"y":480.0,},
         {"$GMRInstance":"v4","%Name":"inst_68D85792","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_68D85792","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":992.0,},
         {"$GMRInstance":"v4","%Name":"inst_29BD5360","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_29BD5360","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":928.0,},
-        {"$GMRInstance":"v4","%Name":"inst_8083626","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8083626","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":864.0,},
-        {"$GMRInstance":"v4","%Name":"inst_116D1480","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_116D1480","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":800.0,},
-        {"$GMRInstance":"v4","%Name":"inst_23E614AB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_23E614AB","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":736.0,},
-        {"$GMRInstance":"v4","%Name":"inst_7E447A91","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7E447A91","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":672.0,},
-        {"$GMRInstance":"v4","%Name":"inst_698457D9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_698457D9","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":608.0,},
-        {"$GMRInstance":"v4","%Name":"inst_2E94E80C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2E94E80C","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":544.0,},
         {"$GMRInstance":"v4","%Name":"inst_6E887A6C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6E887A6C","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":928.0,},
         {"$GMRInstance":"v4","%Name":"inst_116B582C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_116B582C","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":864.0,},
         {"$GMRInstance":"v4","%Name":"inst_1BC019CB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1BC019CB","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":800.0,},
@@ -663,16 +646,6 @@
         {"$GMRInstance":"v4","%Name":"inst_4F3119F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4F3119F","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":1056.0,},
         {"$GMRInstance":"v4","%Name":"inst_76463EFD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_76463EFD","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":992.0,},
         {"$GMRInstance":"v4","%Name":"inst_4AC447C4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4AC447C4","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":928.0,},
-        {"$GMRInstance":"v4","%Name":"inst_59D3FEA7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_59D3FEA7","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":864.0,},
-        {"$GMRInstance":"v4","%Name":"inst_1A32ADC7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1A32ADC7","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":800.0,},
-        {"$GMRInstance":"v4","%Name":"inst_32722A14","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_32722A14","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":736.0,},
-        {"$GMRInstance":"v4","%Name":"inst_454C0F49","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_454C0F49","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":672.0,},
-        {"$GMRInstance":"v4","%Name":"inst_48523220","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_48523220","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":608.0,},
-        {"$GMRInstance":"v4","%Name":"inst_5638A6C6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5638A6C6","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":544.0,},
-        {"$GMRInstance":"v4","%Name":"inst_58385899","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_58385899","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":480.0,},
-        {"$GMRInstance":"v4","%Name":"inst_5E8F3468","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5E8F3468","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":416.0,},
-        {"$GMRInstance":"v4","%Name":"inst_941640C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_941640C","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":352.0,},
-        {"$GMRInstance":"v4","%Name":"inst_BE93B3B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BE93B3B","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":288.0,},
         {"$GMRInstance":"v4","%Name":"inst_401B8E5F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_401B8E5F","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":1056.0,},
         {"$GMRInstance":"v4","%Name":"inst_536AC3E1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_536AC3E1","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":1120.0,},
         {"$GMRInstance":"v4","%Name":"inst_D17D725","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D17D725","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":992.0,},
@@ -688,7 +661,7 @@
         {"$GMRInstance":"v4","%Name":"inst_775AC652","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_775AC652","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":544.0,},
         {"$GMRInstance":"v4","%Name":"inst_4DDFCA54","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4DDFCA54","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":608.0,},
         {"$GMRInstance":"v4","%Name":"inst_3CD68651","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3CD68651","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":352.0,},
-        {"$GMRInstance":"v4","%Name":"inst_37970D8D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_37970D8D","objectId":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":1536.0,},
+        {"$GMRInstance":"v4","%Name":"inst_37970D8D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_37970D8D","objectId":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":1504.0,},
         {"$GMRInstance":"v4","%Name":"inst_4262E1F2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4262E1F2","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":1568.0,},
         {"$GMRInstance":"v4","%Name":"inst_7180869F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7180869F","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":1632.0,},
         {"$GMRInstance":"v4","%Name":"inst_65836E58","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_65836E58","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":1568.0,},
@@ -758,10 +731,8 @@
         {"$GMRInstance":"v4","%Name":"inst_67BD77BC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_67BD77BC","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3360.0,"y":1120.0,},
         {"$GMRInstance":"v4","%Name":"inst_47F1834E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_47F1834E","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3424.0,"y":1120.0,},
         {"$GMRInstance":"v4","%Name":"inst_559173DD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_559173DD","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3488.0,"y":1120.0,},
-        {"$GMRInstance":"v4","%Name":"inst_1E9219BF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1E9219BF","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3488.0,"y":1056.0,},
         {"$GMRInstance":"v4","%Name":"inst_1A6B289E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1A6B289E","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3424.0,"y":1056.0,},
         {"$GMRInstance":"v4","%Name":"inst_6036B3C5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6036B3C5","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3360.0,"y":1056.0,},
-        {"$GMRInstance":"v4","%Name":"inst_263D7F10","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_263D7F10","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3488.0,"y":992.0,},
         {"$GMRInstance":"v4","%Name":"inst_3F8070DB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3F8070DB","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3424.0,"y":992.0,},
         {"$GMRInstance":"v4","%Name":"inst_1D5AC58A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1D5AC58A","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3360.0,"y":992.0,},
         {"$GMRInstance":"v4","%Name":"inst_6888A2E1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6888A2E1","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3488.0,"y":1504.0,},
@@ -786,8 +757,6 @@
         {"$GMRInstance":"v4","%Name":"inst_68439918","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_68439918","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2912.0,"y":544.0,},
         {"$GMRInstance":"v4","%Name":"inst_5AA8FB58","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5AA8FB58","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2912.0,"y":608.0,},
         {"$GMRInstance":"v4","%Name":"inst_2C64A7D0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2C64A7D0","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2976.0,"y":608.0,},
-        {"$GMRInstance":"v4","%Name":"inst_4966C24E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4966C24E","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3296.0,"y":480.0,},
-        {"$GMRInstance":"v4","%Name":"inst_31CF909E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_31CF909E","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3488.0,"y":480.0,},
         {"$GMRInstance":"v4","%Name":"inst_1EAF294","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1EAF294","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2784.0,"y":608.0,},
         {"$GMRInstance":"v4","%Name":"inst_376FC12","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_376FC12","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2848.0,"y":608.0,},
         {"$GMRInstance":"v4","%Name":"inst_467D4752","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_467D4752","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2848.0,"y":544.0,},
@@ -874,6 +843,32 @@
         {"$GMRInstance":"v4","%Name":"inst_22DC81BE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":true,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_22DC81BE","objectId":{"name":"oLight","path":"objects/oLight/oLight.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2240.0,"y":800.0,},
         {"$GMRInstance":"v4","%Name":"inst_53FEE36C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":true,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_53FEE36C","objectId":{"name":"oLight","path":"objects/oLight/oLight.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2528.0,"y":864.0,},
         {"$GMRInstance":"v4","%Name":"inst_40F8F49B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_40F8F49B","objectId":{"name":"oLight","path":"objects/oLight/oLight.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":1376.0,},
+        {"$GMRInstance":"v4","%Name":"inst_72D10E65","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_72D10E65","objectId":{"name":"oBossHex","path":"objects/oBossHex/oBossHex.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":672.0,"y":916.0,},
+        {"$GMRInstance":"v4","%Name":"inst_44D01C07","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_44D01C07","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3488.0,"y":1056.0,},
+        {"$GMRInstance":"v4","%Name":"inst_5D4C200E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5D4C200E","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3488.0,"y":992.0,},
+        {"$GMRInstance":"v4","%Name":"inst_6855FE9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6855FE9","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":608.0,},
+        {"$GMRInstance":"v4","%Name":"inst_5D4D85F4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5D4D85F4","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":544.0,},
+        {"$GMRInstance":"v4","%Name":"inst_47E7530A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_47E7530A","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":480.0,},
+        {"$GMRInstance":"v4","%Name":"inst_4E04F30B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4E04F30B","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":416.0,},
+        {"$GMRInstance":"v4","%Name":"inst_6C016F13","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6C016F13","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":352.0,},
+        {"$GMRInstance":"v4","%Name":"inst_6F6096B4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6F6096B4","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":672.0,},
+        {"$GMRInstance":"v4","%Name":"inst_4403CB47","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4403CB47","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":736.0,},
+        {"$GMRInstance":"v4","%Name":"inst_17F85CC1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_17F85CC1","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":32.0,},
+        {"$GMRInstance":"v4","%Name":"inst_56F5A8C3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_56F5A8C3","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":96.0,},
+        {"$GMRInstance":"v4","%Name":"inst_7A6B505C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7A6B505C","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":160.0,},
+        {"$GMRInstance":"v4","%Name":"inst_21427454","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_21427454","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":224.0,},
+        {"$GMRInstance":"v4","%Name":"inst_4818E793","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4818E793","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":288.0,},
+        {"$GMRInstance":"v4","%Name":"inst_47FEC885","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_47FEC885","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":352.0,},
+        {"$GMRInstance":"v4","%Name":"inst_2E6E7435","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2E6E7435","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":544.0,},
+        {"$GMRInstance":"v4","%Name":"inst_1F04B4FD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1F04B4FD","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":480.0,},
+        {"$GMRInstance":"v4","%Name":"inst_5817553F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5817553F","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":416.0,},
+        {"$GMRInstance":"v4","%Name":"inst_55FA84BE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_55FA84BE","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":736.0,},
+        {"$GMRInstance":"v4","%Name":"inst_67D609E1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_67D609E1","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":672.0,},
+        {"$GMRInstance":"v4","%Name":"inst_3238BFD2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3238BFD2","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":608.0,},
+        {"$GMRInstance":"v4","%Name":"inst_2E93C550","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2E93C550","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":800.0,},
+        {"$GMRInstance":"v4","%Name":"inst_226C4EF4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_226C4EF4","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":864.0,},
+        {"$GMRInstance":"v4","%Name":"inst_67606ED9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_67606ED9","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":800.0,},
+        {"$GMRInstance":"v4","%Name":"inst_52E3ECA1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_52E3ECA1","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":864.0,},
       ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,},
     {"$GMREffectLayer":"","%Name":"Effect","depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Effect","properties":[],"resourceType":"GMREffectLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,},
     {"$GMRBackgroundLayer":"","%Name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4294967295,"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,},
@@ -901,7 +896,7 @@
   },
   "sequenceId":null,
   "views":[
-    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":true,"vspeed":-1,"wport":1920,"wview":1920,"xport":0,"xview":1920,"yport":0,"yview":0,},
+    {"hborder":32,"hport":1080,"hspeed":-1,"hview":1080,"inherit":false,"objectId":null,"vborder":32,"visible":true,"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,},

scripts/BossHexAI/BossHexAI.gml

@@ -0,0 +1,272 @@
+function hex_ai()
+{	
+	switch(state)
+	{
+		case "IDLE":
+			if hp < 240
+			{
+				cnt = 0;
+				roll_init();
+			}
+			break;
+			
+		case "ROLL":
+		
+			rebounce_timer--;
+			
+			var _roll_spd;
+			
+			if abs(roll_angle + roll_spd) >= 60
+				_roll_spd = (60 - abs(roll_angle)) * sign(roll_angle);
+				
+			else if sign(roll_angle) == -sign(roll_angle + roll_spd)
+				_roll_spd = -roll_angle;
+				
+			else
+				_roll_spd = roll_spd;
+			
+			if collision_line(x, y, x + 144 * sign(-_roll_spd), y, oParentSolid, false, false) != noone
+			&& rebounce_timer <= 0
+			{
+				roll_spd *= -1;
+				rebounce_timer = 10;
+				screen_shake(20);
+				
+				++cnt;
+				
+				if cnt == 1
+					roll_acc *= -1;
+				if cnt == 3
+				{
+					cnt = 1;
+					smash_init();
+				}
+			}
+			roll_spd += roll_acc;
+			
+			if abs(roll_angle) == 60 || roll_angle == 0
+			{
+				roll_angle = 0;
+				y = 916;
+					
+				var _base_angle = (roll_spd > 0) ? 240 : 300;
+				pivot_x = x + lengthdir_x(side_len, _base_angle);
+				pivot_y = y + lengthdir_y(side_len, _base_angle);
+			}
+			
+			roll_angle += _roll_spd;
+			image_angle += _roll_spd;
+			
+			var _current_angle = point_direction(pivot_x, pivot_y, x, y);
+			var _new_angle = _current_angle + _roll_spd;
+	
+			x = pivot_x + lengthdir_x(side_len, _new_angle);
+			y = pivot_y + lengthdir_y(side_len, _new_angle);
+			
+			break;
+			
+		case "SMASH_BEGIN":
+			
+			x += x_spd;
+			y += y_spd;
+			image_angle += 0.4 * spd;
+			
+			if y < target_y
+			{
+				state = "SMASH";
+				
+				image_angle = round(image_angle / 60) * 60;
+				
+				y_spd = 20;
+				y_acc = 1;
+				
+				break;
+			}
+	
+			spd += acc;
+			x_spd = lengthdir_x(spd, dir);
+			y_spd = lengthdir_y(spd, dir);
+			
+			break;
+			
+		case "SMASH":
+			
+			y += y_spd;
+			
+			if collision_line(x, y, x, y + 108 + y_spd, oParentSolid, false, false) != noone
+			{
+				while collision_line(x, y, x, y + 108, oParentSolid, false, false) == noone
+					y++;
+				
+				hex_var_erase();
+				
+				screen_shake(20);
+				
+				if !--cnt
+					hex_pick_attack();
+				else
+					smash_init();
+			}
+			y_spd += y_acc;
+			
+			var _x_alter = global.player.x - x
+			x += max(4, _x_alter / 200) * sign(_x_alter);
+			
+			break;
+		
+		case "SPAWN":
+		
+			image_angle += abs(y_spd);
+			y += y_spd;
+			
+			if y_spd == 15
+			{
+				image_angle -= abs(y_spd);
+				
+				hex_var_erase();
+				
+				screen_shake(20);
+				
+				icd(oEnemyHex, x, 998, depth + 1);
+				
+				if !--cnt
+					hex_pick_attack();
+				else
+					spawn_init();
+			}
+			y_spd += y_acc;
+			break;
+		
+		case "BOUNCE":
+			
+			if collision_line(x, y, x + 144 * sign(x_spd), y, oParentSolid, false, false) != noone
+				x_spd = 0;
+			
+			image_angle += facing * 9;
+			x += x_spd;
+			y += y_spd;
+			
+			if y_spd == 20
+			{
+				hex_var_erase();
+				
+				screen_shake(15);
+				
+				if !--cnt
+					hex_pick_attack();
+				else
+					bounce_init();
+					
+				break;
+			}
+			y_spd += y_acc;
+			break;
+		
+	}
+}
+function roll_init()
+{
+    state = "ROLL";
+	roll_spd = 5 * sign(global.player.x - x);
+	roll_acc = -0.1 * sign(global.player.x - x);
+
+    var _base_angle = (roll_spd > 0) ? 240 : 300;
+    pivot_x = x + lengthdir_x(side_len, _base_angle);
+    pivot_y = y + lengthdir_y(side_len, _base_angle);
+}
+function smash_init()
+{
+	state = "SMASH_BEGIN";
+	target_x = clamp(global.player.x, 200, 1920 - 200 - 64);
+	target_y = y - 480;
+
+	dir = point_direction(x, y, target_x, target_y);
+	spd = 15;
+	acc = 0.3;
+	
+	x_spd = lengthdir_x(spd, dir);
+	y_spd = lengthdir_y(spd, dir);
+}
+function spawn_init()
+{
+	y_spd = -15;
+	y_acc = 0.6;
+	
+	state = "SPAWN";
+}
+function bounce_init()
+{
+	state = "BOUNCE";
+
+	y_spd = -20;
+	y_acc = 1;
+
+	facing = sign(global.player.x - x);
+	x_spd = facing * 9;
+}
+
+function hex_pick_attack()
+{
+	hex_var_erase();
+	
+    // 构建候选池
+    var pool = [];
+    var forbidden = [];
+    
+    // 定义禁止规则
+    if last_attack != -1
+		array_push(forbidden, last_attack);
+
+	if instance_number(oEnemyHex) >= 2
+		if array_get_index(forbidden, 3) == -1
+			array_push(forbidden, 3);
+    
+    // 将不在forbidden中的技能加入候选池
+    for (var i = 0; i < 4; i++)
+	{
+        if array_get_index(forbidden, i) == -1
+            array_push(pool, i);
+	}
+    
+    // 从候选池随机选一个
+    var pick = pool[irandom(array_length(pool) - 1)];
+    last_attack = pick;
+	
+	switch(pick)
+	{
+		case 0:
+			cnt = 0;
+			roll_init();
+			break;
+		
+		case 1:
+			cnt = 3;
+			smash_init();
+			break;
+			
+		case 2:
+			cnt = 5;
+			bounce_init();
+			break;
+			
+		case 3:
+			cnt = 2;
+			spawn_init();
+			break;
+	}
+}
+function hex_var_erase()
+{
+	spd = 0;
+	acc = 0;
+	dir = 0;
+	x_spd = 0;
+	y_spd = 0;
+	x_acc = 0;
+	y_acc = 0;
+	roll_spd = 0;
+	roll_acc = 0;
+	roll_angle = 0;
+	
+	y = base_y;
+}

scripts/BossHexAI/BossHexAI.yy

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

scripts/DummyAI/DummyAI.gml

@@ -13,7 +13,7 @@ function enemy_dummy_ai()
 					state = "COUNTER_UP";
 					set_sprite(sEnemyDummyCounter);
 					
-					var _indi = icl(oEnemyDummyIndicator, x, y - 192);
+					var _indi = icl(oEnemyDummyIndicator, x, y - 96);
 					_indi.image_angle = 90;
 				}
 				else
@@ -21,19 +21,18 @@ function enemy_dummy_ai()
 					state = "COUNTER_VER";
 					set_sprite(sEnemyDummyCounter);
 					
-					var _indi = icl(oEnemyDummyIndicator, x, y - 96);
+					var _indi = icl(oEnemyDummyIndicator, x, y);
 					_indi.image_xscale = facing_x;
 				}
 			}
 			facing_x = sign(global.player.x - x);
-			facing_y = sign(global.player.y + sprite_height - y);
+			facing_y = sign(global.player.y + sprite_height / 2 - y);
 			break;
 			
 		case "COUNTER_UP":
 			if animation_end()
 			{
-				var _hb = enemy_create_hitboxBC(144, 384, 0, -192, 10);
-				//_hb.damage = 2;
+				var _hb = enemy_create_hitboxBC(144, 384, 0, -96, 10);
 				
 				state = "ATTACK";
 				set_sprite(sEnemyDummyAttack);
@@ -43,8 +42,7 @@ function enemy_dummy_ai()
 		case "COUNTER_VER":
 			if animation_end()
 			{
-				var _hb = enemy_create_hitboxML(384, 144, 0, -96, 10);
-				//_hb.damage = 2;
+				var _hb = enemy_create_hitboxML(384, 144, 0, 0, 10);
 				
 				state = "ATTACK";
 				set_sprite(sEnemyDummyAttack);

scripts/EnemyStates/EnemyStates.gml

@@ -54,7 +54,6 @@ function enemy_check_hazard()
         y_spd = 0;
 }
 
-
 function enemy_check_hitstun()
 {
 	if hitstun_timer > 0
@@ -149,4 +148,19 @@ _x_offset = 0, _y_offset = 0, _duration = 0)
 		_hb.duration = _duration;
 	}
 	return _hb;
+}
+
+function enemy_death()
+{
+	var _corpse = icd(oEnemyCorpse, x, y, 50);
+	_corpse.x_spd = x_spd_kb;
+	_corpse.y_spd = -max(abs(y_spd_kb), abs(x_spd_kb));
+	_corpse.sprite_index = sprite_index;
+	_corpse.image_angle = image_angle;
+	_corpse.image_index = image_index;
+	
+	if is_method(death_callback)
+		death_callback();
+	
+	instance_destroy();
 }

scripts/HexAI/HexAI.gml

@@ -1,18 +1,18 @@
-function hex_ai()
+function enemy_hex_ai()
 {	
+	roll_spd = clamp(roll_spd, -20, 20);
 	switch(state)
 	{
 		case "IDLE":
-			if oMain._up
-				roll_init();
+			enemy_roll_init();
 			break;
 			
 		case "ROLL":
 		
 			rebounce_timer--;
-			roll_spd += roll_acc;
 			
 			var _roll_spd;
+			roll_angle *= global.time_scale;
 			
 			if abs(roll_angle + roll_spd) >= 60
 				_roll_spd = (60 - abs(roll_angle)) * sign(roll_angle);
@@ -22,47 +22,71 @@ function hex_ai()
 				
 			else
 				_roll_spd = roll_spd;
-				
-			roll_angle += _roll_spd;
-			image_angle += _roll_spd;
-			
-			var _current_angle = point_direction(pivot_x, pivot_y, x, y);
-			var _new_angle = _current_angle + _roll_spd;
-	
-			x = pivot_x + lengthdir_x(side_len, _new_angle);
-			y = pivot_y + lengthdir_y(side_len, _new_angle);
 			
-			if collision_line(x, y, x + 128 * sign(-roll_spd), y, oParentSolid, false, false) != noone
+			if collision_line(x, y, x + 40 * sign(-_roll_spd), y, oParentSolid, false, false) != noone
 			&& rebounce_timer <= 0
 			{
-				roll_acc *= -1;
 				roll_spd *= -1;
-				rebounce_timer = 60;
-				//state = "RETRACE";
+				rebounce_timer = 10;
+				
+				roll_acc *= -1;
 			}
-			else if abs(roll_angle) >= 60 || roll_angle == 0
+			roll_spd += roll_acc;
+			
+			if abs(roll_angle) == 60 || roll_angle == 0
 			{
 				roll_angle = 0;
+				y = base_y;
 					
 				var _base_angle = (roll_spd > 0) ? 240 : 300;
 				pivot_x = x + lengthdir_x(side_len, _base_angle);
 				pivot_y = y + lengthdir_y(side_len, _base_angle);
 			}
+			
+			roll_angle += _roll_spd;
+			image_angle += _roll_spd;
+			
+			var _current_angle = point_direction(pivot_x, pivot_y, x, y);
+			var _new_angle = _current_angle + _roll_spd;
+	
+			x = pivot_x + lengthdir_x(side_len, _new_angle);
+			y = pivot_y + lengthdir_y(side_len, _new_angle);
+			
 			break;
 			
-		case "RETRACE":
-			//roll_spd += roll_acc;
+		case "SPAWN":
+		
+			image_angle += abs(y_spd) * global.time_scale;
+			x += x_spd * global.time_scale;
+			y += y_spd * global.time_scale;
 			
+			if y_spd == 15
+			{
+				x_spd = 0;
+				y_spd = 0;
+				y_acc = 0;
+				state = "IDLE";
+			}
+			y_spd += y_acc;
 			break;
 	}
 }
-function roll_init()
+function enemy_roll_init()
 {
     state = "ROLL";
-	roll_spd = 5;
-	roll_acc = -0.1;
+	roll_spd = 5 * choose(-1, 1);
+	roll_acc = -0.1 * sign(roll_spd);
 
     var _base_angle = (roll_spd > 0) ? 240 : 300;
     pivot_x = x + lengthdir_x(side_len, _base_angle);
     pivot_y = y + lengthdir_y(side_len, _base_angle);
+}
+function enemy_spawn_init()
+{
+	y_spd = -15;
+	x_spd = sign(global.player.x - x) * random_range(10, 15);
+	
+	y_acc = 0.6;
+	
+	state = "SPAWN";
 }

scripts/HexAI/HexAI.yy

@@ -5,8 +5,8 @@
   "isDnD":false,
   "name":"HexAI",
   "parent":{
-    "name":"oBossHex",
-    "path":"folders/Enemy/oBossHex.yy",
+    "name":"oEnemyHex",
+    "path":"folders/Enemy/oBossHex/oEnemyHex.yy",
   },
   "resourceType":"GMScript",
   "resourceVersion":"2.0",

scripts/ParticleEffects/ParticleEffects.gml

@@ -0,0 +1,21 @@
+function pe_blade_hit_hazard(_x, _y)
+{
+	var _part = part_system_create_layer("Effect", false);
+	var _type = part_type_create();
+	var _dir = point_direction(0, 0, _x, _y);
+
+	part_type_shape(_type, pt_shape_line);
+	part_type_scale(_type, 0.4, 1)
+	part_type_size(_type, 0.3, 0.5, 0, 0);
+	part_type_speed(_type, 15, 20, 0, 0);
+	part_type_direction(_type, _dir - 45, _dir + 45, 0, 5);
+	part_type_color3(_type, c_white, c_yellow, c_orange);
+	part_type_alpha2(_type, 1.0, 0.0);
+	part_type_life(_type, 30, 30);
+	part_type_gravity(_type, 1, 270);
+
+	part_particles_create(_part, x, y, _type, 12);
+
+	part_type_destroy(_type);
+	part_system_destroy(_part);
+}

scripts/ParticleEffects/ParticleEffects.yy

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

scripts/PlayerStates/PlayerStates.gml

@@ -53,7 +53,9 @@ function player_status_update()
 	if !instance_exists(current_hb)
 		current_hb = noone;
 	
-	/**/
+	if state != state_focus
+		INK_blend = 0;
+
 	image_index += animation_spd;
 	
 	if oMain._dash
@@ -71,6 +73,18 @@ function player_status_update()
 	
 	_on_wall = place_meeting(x + 1, y, oBlockClimbable)
 			- place_meeting(x - 1, y, oBlockClimbable);
+			
+	var _no_cliff = place_meeting(x - sprite_width, y + 1, oParentSolid)
+	&& place_meeting(x + sprite_width, y + 1, oParentSolid)
+	
+	var _no_hazard = !(place_meeting(x - sprite_width, y, oParentHazard)
+	|| place_meeting(x + sprite_width, y, oParentHazard))
+			
+	if _on_ground && _no_cliff && _no_hazard
+	{
+		last_safe_x = x;
+		last_safe_y = y;
+	}
 
 	if _on_ground || (_on_wall != 0)
 		can_dash = true;
@@ -191,11 +205,12 @@ function player_check_dodge()
 }
 function player_check_death()
 {
-	if state == state_death
+	if state == state_death || state == state_locked
 		return;
 	
 	if global.playerHP <= 0
 	{
+		/*
 		var _drop = round(random_range(0.4 * global.save_data.player.Credit,
 		0.6 * global.save_data.player.Credit));
 		
@@ -205,15 +220,25 @@ function player_check_death()
 		global.save_data.player.corpse.targetRoom = room;
 		global.save_data.player.corpse.xPos = x; //lastsafe
 		global.save_data.player.corpse.yPos = y; //lastsafe
+		*/
 		
 		save_game_to_disk();
 		state = state_death;
 		set_sprite(sPlayerDeath);
+		screen_shake(30);
+		
+		var _cam = view_camera[0];
+		var	_cam_x = camera_get_view_x(_cam);
+		var _cam_y = camera_get_view_y(_cam);
+
+		var _ripple = icl(oRippleDeath);
+		_ripple.x = (x - _cam_x);
+		_ripple.y = (y - _cam_y);
 	}
 }
 function player_check_focus()
 {
-	if oMain._focus && global.playerINK >= 0
+	if oMain._focus && global.playerINK >= 9
 	{
 		set_sprite(sPlayerFocus);
 		state = state_focus;
@@ -308,6 +333,9 @@ function player_check_attacked()
 	{
 		global.playerINK -= 9;
 		global.hitstop = 24;
+		INK_blend = 0;
+		flash_duration = 24;
+		flash_timer = 24;
 	}
 	else global.hitstop = 12;
 	
@@ -374,9 +402,9 @@ function state_hitstun_hazard()
 		var _fade = icl(oFade);
 		_fade._callback = function()
 		{
-			oPlayer.x = 160;//oPlayer.last_safe_x;
-			oPlayer.y = 2016 - 540 + 64;//oPlayer.last_safe_y;
-			camera_snap();
+			oPlayer.x = oPlayer.last_safe_x;
+			oPlayer.y = oPlayer.last_safe_y;
+			//camera_snap();
 		};
 	}
 	player_check_death();
@@ -444,6 +472,7 @@ function state_attack()
 	player_check_movement();
 	player_check_jump();
 	player_check_dash();
+	player_check_focus();
 	
     y_spd += player_calc_gravity();
 	
@@ -491,18 +520,20 @@ function state_death()
 {	
 	x_spd = 0;
 	y_spd = 0;
+	invincible_timer = 150;
 	if animation_end()
 	{
-		global.playerHP = global.save_data.player.maxHP;
-		global.playerINK = 0;
 		
 		state = state_locked;
+		invincible_timer = 150;
 		locked_timer = 90;
 		
 		var _fade = icl(oFade);
 		_fade._callback = function()
 		{
 			room_goto(asset_get_index(global.save_data.world.current_room));
+			global.playerHP = global.save_data.player.maxHP;
+			global.playerINK = 0;
 		}
 	}
 }
@@ -512,7 +543,7 @@ function state_focus()
 	y_spd = 0;
 	if animation_end()
 	{
-		player_add_INK(0);
+		player_add_INK(-9);
 		global.playerHP += 3;
 		global.playerHP = clamp(global.playerHP, 0, global.save_data.player.maxHP);
 		state = state_free;

scripts/general/general.gml

@@ -25,8 +25,8 @@ function set_sprite(_sprite)
 
 function camera_snap()
 {
-	oCamera.x = oCamera.x_to;
-	oCamera.y = oCamera.y_to;	
+	oCamera.x = oCamera.follow.x;
+	oCamera.y = oCamera.follow.y;	
 }
 
 /// @desc 触发屏幕震动

shaders/sh_grey/sh_grey.fsh

@@ -0,0 +1,10 @@
+varying vec2 v_vTexcoord;
+varying vec4 v_vColour;
+
+void main()
+{
+    vec4 col = texture2D(gm_BaseTexture, v_vTexcoord);
+    float grey = dot(col.rgb, vec3(0.299, 0.587, 0.114));
+    vec3 grey_col = vec3(grey, grey, grey);
+    gl_FragColor = vec4(mix(col.rgb, grey_col, 0.5), col.a) * v_vColour;
+}

shaders/sh_grey/sh_grey.vsh

@@ -0,0 +1,19 @@
+//
+// Simple passthrough vertex shader
+//
+attribute vec3 in_Position;                  // (x,y,z)
+//attribute vec3 in_Normal;                  // (x,y,z)     unused in this shader.
+attribute vec4 in_Colour;                    // (r,g,b,a)
+attribute vec2 in_TextureCoord;              // (u,v)
+
+varying vec2 v_vTexcoord;
+varying vec4 v_vColour;
+
+void main()
+{
+    vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0);
+    gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos;
+    
+    v_vColour = in_Colour;
+    v_vTexcoord = in_TextureCoord;
+}

shaders/sh_grey/sh_grey.yy

@@ -0,0 +1,12 @@
+{
+  "$GMShader":"",
+  "%Name":"sh_grey",
+  "name":"sh_grey",
+  "parent":{
+    "name":"ddmyx",
+    "path":"ddmyx.yyp",
+  },
+  "resourceType":"GMShader",
+  "resourceVersion":"2.0",
+  "type":1,
+}

sprites/sEnemyCrawl/sEnemyCrawl.yy

@@ -24,7 +24,7 @@
   ],
   "name":"sEnemyCrawl",
   "nineSlice":null,
-  "origin":7,
+  "origin":4,
   "parent":{
     "name":"oEnemyCrawl",
     "path":"folders/Enemy/oEnemyCrawl.yy",
@@ -80,7 +80,7 @@
     "visibleRange":null,
     "volume":1.0,
     "xorigin":32,
-    "yorigin":64,
+    "yorigin":32,
   },
   "swatchColours":null,
   "swfPrecision":0.5,