no message

ddmyx.yyp

@@ -14,7 +14,7 @@
     {"$GMFolder":"","%Name":"Enemy","folderPath":"folders/Enemy.yy","name":"Enemy","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"oBossHex","folderPath":"folders/Enemy/oBossHex.yy","name":"oBossHex","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"oEnemyHex","folderPath":"folders/Enemy/oBossHex/oEnemyHex.yy","name":"oEnemyHex","resourceType":"GMFolder","resourceVersion":"2.0",},
-    {"$GMFolder":"","%Name":"oEnemyCorpse","folderPath":"folders/Enemy/oEnemyCorpse.yy","name":"oEnemyCorpse","resourceType":"GMFolder","resourceVersion":"2.0",},
+    {"$GMFolder":"","%Name":"oPlayerCorpse","folderPath":"folders/Enemy/oPlayerCorpse.yy","name":"oPlayerCorpse","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",},
@@ -85,6 +85,7 @@
     {"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",},},
@@ -116,6 +117,7 @@
     {"id":{"name":"Simplifier","path":"scripts/Simplifier/Simplifier.yy",},},
     {"id":{"name":"SL","path":"scripts/SL/SL.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":"sBladeHitEffect","path":"sprites/sBladeHitEffect/sBladeHitEffect.yy",},},
     {"id":{"name":"sBlockClimbable","path":"sprites/sBlockClimbable/sBlockClimbable.yy",},},

objects/oBossHex/Create_0.gml

@@ -1,6 +1,6 @@
 event_inherited();
 
-hp = 240;
+hp = 24;
 
 credit = 30;
 
@@ -32,4 +32,21 @@ angle_alter = 0;
 
 cnt = 0;
 
-last_attack = -1;
+last_attack = -1;
+
+depth = 10;
+
+base_y = 916;
+
+death_callback = function()
+{
+	with(oEnemyHex)
+	{
+		x_spd_kb = choose(-1, 1) * 15;
+		y_spd_kb = 0;
+		enemy_death();
+	}
+	global.time_scale_t = 0;
+	global.time_scale = 0.05;
+	global.camera.follow = global.player;
+}

objects/oBossHex/Step_0.gml

@@ -5,4 +5,11 @@ image_index += animation_spd;
 
 enemy_ai();
 
-x = clamp(x, 200, 1920 - 200 - 64);
+x = clamp(x, 200, 1920 - 200 - 64);
+
+if state != "IDLE"
+{
+	oCamera.x_to = 0;
+	oCamera.y_to = 0;
+	oCamera.follow = noone;
+}

objects/oCamera/Create_0.gml

@@ -4,6 +4,8 @@ cam_height = 1080;
 x_to = 0;
 y_to = 0;
 
-smooth = 0.1;
+smooth = 0.05;
 
-shake_magnitude = 0;
+shake_magnitude = 0;
+
+follow = global.player;

objects/oCamera/Step_0.gml

@@ -1,11 +1,7 @@
-follow = global.player;
-
 if instance_exists(follow)
 {
-	x_to = 0;
-	y_to = 0;
-    //x_to = follow.x;
-    //y_to = follow.y;
+    x_to = follow.x;
+    y_to = follow.y;
 }
 
 shake_magnitude = lerp(shake_magnitude, 0, 0.05);
@@ -15,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/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/oEnemyHex/Create_0.gml

@@ -1,6 +1,6 @@
 event_inherited();
 
-hp = 12;
+hp = 9;
 credit = 0;
 
 enemy_ai = enemy_hex_ai;
@@ -25,4 +25,6 @@ enemy_spawn_init();
 
 rebounce_timer = 0;
 
-angle_alter = 0;
+angle_alter = 0;
+
+base_y = 998;

objects/oEnemyHitbox/Create_0.gml

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

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

@@ -8,4 +8,12 @@ if global.developer_mode
 		oPlayer.x = mouse_x;
 		oPlayer.y = mouse_y;
 	}	
+}
+
+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));
 }

objects/oParentEnemy/Create_0.gml

@@ -16,7 +16,7 @@ get_hit = function(_info)
     if hp <= 0
 	{
         is_dead = true;
-        instance_destroy();
+        enemy_death();
     }
 };
 
@@ -42,6 +42,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/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,11 @@ else
 			global.player.y = y;
 		}
 	}
+	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

@@ -20,4 +20,6 @@ hit_info = {
 if global.developer_mode
 	image_blend = c_red;
 else
-	image_alpha = 0;
+	image_alpha = 0;
+	
+depth = 100;

rooms/rTest_1/rTest_1.yy

@@ -537,7 +537,6 @@
     {"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",},
   ],
   "isDnd":false,
@@ -573,7 +572,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,},
@@ -956,7 +955,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,},
@@ -979,7 +978,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":2944.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,},
@@ -1084,8 +1083,7 @@
         {"$GMRInstance":"v4","%Name":"inst_50E073CD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_50E073CD","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2976.0,"y":480.0,},
         {"$GMRInstance":"v4","%Name":"inst_273279C9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_273279C9","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":480.0,},
         {"$GMRInstance":"v4","%Name":"inst_4AB26584","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4AB26584","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":160.0,},
-        {"$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_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,},
       ],"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

@@ -674,7 +674,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,},

scripts/BossHexAI/BossHexAI.gml

@@ -127,7 +127,7 @@ function hex_ai()
 				
 				screen_shake(20);
 				
-				icd(oEnemyHex, x, 998);
+				icd(oEnemyHex, x, 998, depth + 1);
 				
 				if !--cnt
 					hex_pick_attack();
@@ -148,20 +148,17 @@ function hex_ai()
 			
 			if y_spd == 20
 			{
-				image_angle -= facing * 9;
-				
 				hex_var_erase();
 				
-				screen_shake(20);
+				screen_shake(15);
 				
 				if !--cnt
 					hex_pick_attack();
 				else
 					bounce_init();
-				
+					
 				break;
 			}
-			
 			y_spd += y_acc;
 			break;
 		
@@ -270,4 +267,6 @@ function hex_var_erase()
 	roll_spd = 0;
 	roll_acc = 0;
 	roll_angle = 0;
+	
+	y = base_y;
 }

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

@@ -10,9 +10,9 @@ function enemy_hex_ai()
 		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,38 +22,43 @@ function enemy_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 + 32 * 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_spd *= -1;
+				rebounce_timer = 10;
+				
 				roll_acc *= -1;
-				rebounce_timer = 12;
 			}
-			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 "SPAWN":
 		
-			image_angle += abs(y_spd);
-			x += x_spd;
-			y += y_spd;
+			image_angle += abs(y_spd) * global.time_scale;
+			x += x_spd * global.time_scale;
+			y += y_spd * global.time_scale;
 			
 			if y_spd == 15
 			{

scripts/PlayerStates/PlayerStates.gml

@@ -71,6 +71,16 @@ 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)
+			
+	if _on_ground && _no_cliff &&
+	current_hazard == noone && current_attacker == noone
+	{
+		last_safe_x = x;
+		last_safe_y = y;
+	}
 
 	if _on_ground || (_on_wall != 0)
 		can_dash = true;
@@ -196,6 +206,7 @@ function player_check_death()
 	
 	if global.playerHP <= 0
 	{
+		/*
 		var _drop = round(random_range(0.4 * global.save_data.player.Credit,
 		0.6 * global.save_data.player.Credit));
 		
@@ -205,6 +216,7 @@ 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;
@@ -308,6 +320,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,8 +389,8 @@ 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;
+			oPlayer.x = oPlayer.last_safe_x;
+			oPlayer.y = oPlayer.last_safe_y;
 			camera_snap();
 		};
 	}

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,

sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy

@@ -13,13 +13,13 @@
   "For3D":false,
   "frames":[
     {"$GMSpriteFrame":"v1","%Name":"313d19ac-423c-4585-89d5-d727c8a6382e","name":"313d19ac-423c-4585-89d5-d727c8a6382e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
-    {"$GMSpriteFrame":"v1","%Name":"84025141-6526-4274-91d8-896cea9709f7","name":"84025141-6526-4274-91d8-896cea9709f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
-    {"$GMSpriteFrame":"v1","%Name":"84871857-d604-44d9-8721-cc7a4366d386","name":"84871857-d604-44d9-8721-cc7a4366d386","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
-    {"$GMSpriteFrame":"v1","%Name":"ae9034b3-fcb2-4f9c-b507-f6626ffbfb6d","name":"ae9034b3-fcb2-4f9c-b507-f6626ffbfb6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
-    {"$GMSpriteFrame":"v1","%Name":"348f603a-d75d-4b72-bf68-ff75045f7e9e","name":"348f603a-d75d-4b72-bf68-ff75045f7e9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
-    {"$GMSpriteFrame":"v1","%Name":"1d22c0c7-7cb6-4edd-82b3-a89823d6945f","name":"1d22c0c7-7cb6-4edd-82b3-a89823d6945f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
-    {"$GMSpriteFrame":"v1","%Name":"9c79c1b3-6f93-432e-b19d-ca5ac1601499","name":"9c79c1b3-6f93-432e-b19d-ca5ac1601499","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
-    {"$GMSpriteFrame":"v1","%Name":"011dd06a-0e18-4aa0-926a-3710b13c329d","name":"011dd06a-0e18-4aa0-926a-3710b13c329d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"35add0fd-edca-4612-b51a-264364318c8f","name":"35add0fd-edca-4612-b51a-264364318c8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"67e3d1d5-7a53-4d83-bdd0-93198a9f2874","name":"67e3d1d5-7a53-4d83-bdd0-93198a9f2874","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"c08f2b49-3dda-45ec-9fb9-17fab1aa78a7","name":"c08f2b49-3dda-45ec-9fb9-17fab1aa78a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"d8e5379e-ad36-4b76-8612-0a6006b942a2","name":"d8e5379e-ad36-4b76-8612-0a6006b942a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"a3847d4e-99a5-4be0-9e7c-5f96b3fedf22","name":"a3847d4e-99a5-4be0-9e7c-5f96b3fedf22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"28a21ced-72d0-4693-81b7-8c524aedcd16","name":"28a21ced-72d0-4693-81b7-8c524aedcd16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"a055a12a-1cfb-4926-8a79-32c2c00b7c8b","name":"a055a12a-1cfb-4926-8a79-32c2c00b7c8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
   ],
   "gridX":0,
   "gridY":0,
@@ -30,7 +30,7 @@
   ],
   "name":"sEnemyDummyAttack",
   "nineSlice":null,
-  "origin":7,
+  "origin":4,
   "parent":{
     "name":"oEnemyDummy",
     "path":"folders/Enemy/oEnemyDummy.yy",
@@ -79,32 +79,32 @@
                 "0":{"$SpriteFrameKeyframe":"","Id":{"name":"313d19ac-423c-4585-89d5-d727c8a6382e","path":"sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
               },"Disabled":false,"id":"803bc476-ea8e-4da5-bd78-635ef15618c1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
             {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
-                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84025141-6526-4274-91d8-896cea9709f7","path":"sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
-              },"Disabled":false,"id":"dbb4428f-5f90-41bc-9e47-de0ac7ed8e93","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"35add0fd-edca-4612-b51a-264364318c8f","path":"sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"00d8d39c-be5a-4baa-958c-1e2a0e3ba615","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
             {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
-                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84871857-d604-44d9-8721-cc7a4366d386","path":"sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
-              },"Disabled":false,"id":"94c45e0a-0396-4363-be75-9137d8a14c13","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67e3d1d5-7a53-4d83-bdd0-93198a9f2874","path":"sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"276d38f7-ae0c-4eac-b127-4c6dad65c381","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
             {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
-                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae9034b3-fcb2-4f9c-b507-f6626ffbfb6d","path":"sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
-              },"Disabled":false,"id":"4f62152b-c450-4294-841f-9dacca57d9e3","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c08f2b49-3dda-45ec-9fb9-17fab1aa78a7","path":"sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"2bc337cf-f596-44f7-b7fe-cc873b49f36a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
             {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
-                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"348f603a-d75d-4b72-bf68-ff75045f7e9e","path":"sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
-              },"Disabled":false,"id":"089632c7-6a61-4260-8137-7f09e3227897","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8e5379e-ad36-4b76-8612-0a6006b942a2","path":"sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"202fcdfd-cf17-4783-8142-9d610b740b0a","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
             {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
-                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d22c0c7-7cb6-4edd-82b3-a89823d6945f","path":"sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
-              },"Disabled":false,"id":"33bbbe27-abba-4c01-8cd1-380d721f1704","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3847d4e-99a5-4be0-9e7c-5f96b3fedf22","path":"sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"802b3f8f-278d-4c8a-91ea-6219c8e1c0a1","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
             {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
-                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c79c1b3-6f93-432e-b19d-ca5ac1601499","path":"sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
-              },"Disabled":false,"id":"72feb8a3-2bf4-44dc-8f54-bde013bad473","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28a21ced-72d0-4693-81b7-8c524aedcd16","path":"sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"2cb33114-61ea-4574-8053-2fb441a9c200","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
             {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
-                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"011dd06a-0e18-4aa0-926a-3710b13c329d","path":"sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
-              },"Disabled":false,"id":"d8186ef2-2fbb-488f-80f8-301fde2c4f8e","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a055a12a-1cfb-4926-8a79-32c2c00b7c8b","path":"sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"eef6b664-2f39-4fce-ae31-77b458f632c0","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
           ],"resourceType":"KeyframeStore<SpriteFrameKeyframe>","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,},
     ],
     "visibleRange":null,
     "volume":1.0,
     "xorigin":48,
-    "yorigin":192,
+    "yorigin":96,
   },
   "swatchColours":null,
   "swfPrecision":0.5,