diff --git a/background/tlRock2NB.background.gmx b/background/tlRock2NB.background.gmx index 3feddd8..dc33ece 100644 --- a/background/tlRock2NB.background.gmx +++ b/background/tlRock2NB.background.gmx @@ -1,8 +1,8 @@ - 0 - 1 - 1 + -1 + 16 + 16 0 0 0 diff --git a/objects/oBlockSpeed.object.gmx b/objects/oBlockSpeed.object.gmx index ec5cbfc..e64bb98 100644 --- a/objects/oBlockSpeed.object.gmx +++ b/objects/oBlockSpeed.object.gmx @@ -54,6 +54,10 @@ block.regentime = regentime; block.alarm[0] = regentime; block.link_id = link_id; block.delay = delay; +if(DEPTH != 0){ + block.depth = DEPTH; + block.DEPTH = DEPTH; +} with (block) event_user(1); sfx_stop(sndBlockDestroy); sfx_play(sndBlockDestroy); diff --git a/objects/oDestroyedBlock.object.gmx b/objects/oDestroyedBlock.object.gmx index eca635a..403205b 100644 --- a/objects/oDestroyedBlock.object.gmx +++ b/objects/oDestroyedBlock.object.gmx @@ -30,6 +30,7 @@ image_index = 0; state = 0; statetime = 0; type = 0; +DEPTH = 0; @@ -171,6 +172,10 @@ block.material = 0; block.delay = delay; block.link_id = link_id; block.visible = true; +if(DEPTH != 0){ + block.depth = DEPTH; + block.DEPTH = DEPTH; +} instance_destroy(); diff --git a/objects/oOptionsMod.object.gmx b/objects/oOptionsMod.object.gmx index c1b8c1e..add7c41 100644 --- a/objects/oOptionsMod.object.gmx +++ b/objects/oOptionsMod.object.gmx @@ -40,6 +40,7 @@ num_sequence = tempnumcounter++; num_color = tempnumcounter++; num_showname = tempnumcounter++; num_difficulty = tempnumcounter++; +num_elm = tempnumcounter++; num_seedgen = tempnumcounter++; num_connection = tempnumcounter++; @@ -55,6 +56,8 @@ menuDifficulty = global.difficulty; if(oControl.mod_fusion) menuDifficulty = 3; +elm = oControl.mod_monstersextremecheck; + connectiontxt = "Connect"; if(instance_exists(oClient)){ @@ -108,6 +111,7 @@ tip[num_sequence] = "Toggle whether the reactor sequence is synced"; tip[num_color] = "Pick your preferred player color"; tip[num_showname] = "Enable/disable showing player names"; tip[num_difficulty] = "Choose the shared Multitroid difficulty"; +tip[num_elm] = "Choose the shared ELM difficulty"; tip[num_seedgen] = "Generate a random seed for Multitroid"; tip[num_connection] = "Connect/disconnect to the server"; @@ -463,6 +467,19 @@ if(!done){ } } + if(!instance_exists(oClient)){ + op[num_elm].enabled = 0; + canedit[num_elm] = 0; + } else { + if(!instance_exists(oSS_Control)){ + op[num_elm].enabled = 1; + canedit[num_elm] = 1; + } else { + op[num_elm].enabled = 0; + canedit[num_elm] = 0; + } + } + switch(menuDifficulty){ case 0: op[num_difficulty].optext = "Easy"; @@ -633,35 +650,6 @@ switch(showname){ break; } -//if (oControl.mod_earlybaby == 1) { -// op[num_baby].optext = get_text("GlobalOptions", "Enabled"); -//} else op[num_baby].optext = get_text("GlobalOptions", "Disabled"); -//if (global.mod_gamebeaten == 0) { -// op[num_baby].optext = get_text("ExtrasMenu", "Locked"); -//} - -/*if (oControl.mod_monstersextremecheck == 1) { - op[num_exmonsters].optext = get_text("GlobalOptions", "Enabled"); -} else op[num_exmonsters].optext = get_text("GlobalOptions", "Disabled"); -if (global.mod_gamebeaten == 0) { - op[num_exmonsters].optext = get_text("ExtrasMenu", "Locked"); -}*/ -//if (global.shaders_compiled) { -// if (oControl.msr_fusionsuit == 1) { -// op[num_MSRfusion].optext = get_text("ExtrasMenu", "MSR"); -// } else op[num_MSRfusion].optext = get_text("ExtrasMenu", "Default"); -// if (global.mod_fusion_unlocked == 0) { -// op[num_MSRfusion].optext = get_text("ExtrasMenu", "Locked"); -// } -//} - -//if (oControl.mod_IGT == 1) { -// op[num_IGT].optext = get_text("GlobalOptions", "Enabled"); -//} else op[num_IGT].optext = get_text("GlobalOptions", "Disabled"); -//if (global.mod_gamebeaten == 0) { -// op[num_IGT].optext = get_text("ExtrasMenu", "Locked"); -//} - switch(oControl.preferredcolor){ case 1: color = "green"; @@ -821,6 +809,10 @@ op[num_difficulty] = instance_create(x, y + sep * tempcount++, oOptionLR); op[num_difficulty].label = "Difficulty"; op[num_difficulty].optionid = num_difficulty; +op[num_elm] = instance_create(x, y + sep * tempcount++, oOptionLR); +op[num_elm].label = "Extreme Lab Metroids"; +op[num_elm].optionid = num_elm; + op[num_seedgen] = instance_create(x, y + sep * tempcount++, oPauseOption); op[num_seedgen].optionid = num_seedgen; op[num_seedgen].label = "Generate seed"; diff --git a/objects/oSolid.object.gmx b/objects/oSolid.object.gmx index f19ccee..620134e 100644 --- a/objects/oSolid.object.gmx +++ b/objects/oSolid.object.gmx @@ -34,6 +34,7 @@ link_id = 0; delay = 0; tl1_delete_layer = -111; tl2_delete_layer = -112; +DEPTH = 0; diff --git a/rooms/rm_a0h07.room.gmx b/rooms/rm_a0h07.room.gmx index 11d3ec9..2919dca 100644 --- a/rooms/rm_a0h07.room.gmx +++ b/rooms/rm_a0h07.room.gmx @@ -25,6 +25,13 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. with (inst_102590) { instance_destroy(); } with (inst_102591) { instance_destroy(); } with (inst_102592) { instance_destroy(); } +} + +with(oBlockSpeed){ + regentime = 30; + depth = -112; + DEPTH = -112; + tileid = tile_layer_find(-100, x, y); } -1 -1 @@ -445,15 +452,7 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. - - - - - - - - @@ -491,7 +490,7 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. - + @@ -514,6 +513,39 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1010,10 +1042,6 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. - - - - @@ -1082,7 +1110,6 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. - @@ -1092,8 +1119,6 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. - - @@ -1275,7 +1300,6 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. - @@ -1309,7 +1333,6 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. - @@ -1334,7 +1357,6 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. - @@ -1407,7 +1429,6 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. - @@ -1441,7 +1462,6 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. - @@ -1516,15 +1536,12 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. - - - @@ -1589,7 +1606,6 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. - @@ -1646,6 +1662,68 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1656,6 +1734,32 @@ if (oControl.mod_purerandombool == 1 || oControl.mod_splitrandom == 1 || global. + + + + + + + + + + + + + + + + + + + + + + + + + + 0 0 diff --git a/scripts/send_seed.gml b/scripts/send_seed.gml index 37a2596..403d823 100644 --- a/scripts/send_seed.gml +++ b/scripts/send_seed.gml @@ -1,4 +1,12 @@ /// send_seed +var str, currSeed; +str = "Seed sent"; +currSeed = oClient.seed; +if(oControl.mod_usemanualseed){ + str = "Manual seed sent"; + currSeed = oControl.mod_seed; +} + var size, type, alignment; size = 1024; type = buffer_grow; @@ -6,13 +14,13 @@ alignment = 1; seedBuffer = buffer_create(size, type, alignment); buffer_seek(seedBuffer, buffer_seek_start, 0); buffer_write(seedBuffer, buffer_u8, 3); -buffer_write(seedBuffer, buffer_f64, oClient.seed); +buffer_write(seedBuffer, buffer_f64, currSeed); buffer_write(seedBuffer, buffer_u8, global.clientID); var bufferSize = buffer_tell(seedBuffer); buffer_seek(seedBuffer, buffer_seek_start, 0); buffer_write(seedBuffer, buffer_s32, bufferSize); buffer_write(seedBuffer, buffer_u8, 3); -buffer_write(seedBuffer, buffer_f64, oClient.seed); +buffer_write(seedBuffer, buffer_f64, currSeed); buffer_write(seedBuffer, buffer_u8, global.clientID); var result = network_send_packet(oClient.socket, seedBuffer, buffer_tell(seedBuffer)); -popup_text("Seed sent"); +popup_text(str);