diff --git a/objects/oBlockPBombChain.object.gmx b/objects/oBlockPBombChain.object.gmx index 212916f..6456880 100644 --- a/objects/oBlockPBombChain.object.gmx +++ b/objects/oBlockPBombChain.object.gmx @@ -50,6 +50,47 @@ if (global.event[176] == 1 && room == rm_a0h13) instance_destroy(); 1 event_user(0); + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + if (global.event[176] == 1 && room == rm_a0h13){ + block = instance_create(x, y, oDestroyedBlock); + block.type = 6; + block.regentime = -1; + block.link_id = link_id; + block.delay = delay; + with (block) event_user(1); + block1 = collision_point(x + 2, y - 2, oBlockBombChain, false, false); + block2 = collision_point(x + 18, y + 2, oBlockBombChain, false, false); + block3 = collision_point(x + 2, y + 18, oBlockBombChain, false, false); + block4 = collision_point(x - 2, y + 2, oBlockBombChain, false, false); + if (block1 > 0) with (block1) alarm[10] = 4; + if (block2 > 0) with (block2) alarm[10] = 4; + if (block3 > 0) with (block3) alarm[10] = 4; + if (block4 > 0) with (block4) alarm[10] = 4; + sfx_stop(sndBlockDestroy); + sfx_play(sndBlockDestroy); + instance_destroy(); +} diff --git a/objects/oClient.object.gmx b/objects/oClient.object.gmx index 7d5538f..538bfa4 100644 --- a/objects/oClient.object.gmx +++ b/objects/oClient.object.gmx @@ -151,7 +151,7 @@ switch(preferredcolor){ case "hot pink": preferredcolor = 15; break; - case "dull green": + case "retro green": preferredcolor = 16; break; case "random": @@ -1216,15 +1216,21 @@ if(instance_exists(oCharacter)){ global.event[203] = 9; } } - +//Ensure Arachnus event syncs properly if(global.event[103] > 0){ global.event[103] = floor(global.event[103]); } +//Reset Queen phase when dead if(global.event[303] > 0){ phase = 0; } +//Changes drill event to already be done +if(global.event[172] != 3){ + global.event[172] = 3; +} + if(room == rm_death){ phase = 0; queenHealth = global.mod_queenHstart + (global.mtanks * 10);; diff --git a/objects/oControl.object.gmx b/objects/oControl.object.gmx index 63a58b5..4c90983 100644 --- a/objects/oControl.object.gmx +++ b/objects/oControl.object.gmx @@ -474,7 +474,7 @@ switch(preferredcolor){ case "hot pink": preferredcolor = 15; break; - case "dull green": + case "retro green": preferredcolor = 16; break; case "random": diff --git a/objects/oOptionsMod.object.gmx b/objects/oOptionsMod.object.gmx index 1f75115..ce2ebfc 100644 --- a/objects/oOptionsMod.object.gmx +++ b/objects/oOptionsMod.object.gmx @@ -686,7 +686,7 @@ switch(oControl.preferredcolor){ op[num_color].optext = "Hot Pink"; break; case 16: - op[num_color].optext = "Dull Green"; + op[num_color].optext = "Retro Green"; break; case 17: op[num_color].optext = "Random"; @@ -762,7 +762,7 @@ switch(oControl.preferredcolor){ color = "hot pink"; break; case 16: - color = "dull green"; + color = "retro green"; break; case 17: color = "random";