From 5b74de42a74a35d87ef8ba684706f859d5674d2f Mon Sep 17 00:00:00 2001 From: milesthenerd Date: Mon, 11 Jan 2021 12:01:46 -0600 Subject: [PATCH] Getting locked in final metroid rooms should no longer be possible --- objects/oDoor.object.gmx | 69 ++-------------------------------------- 1 file changed, 3 insertions(+), 66 deletions(-) diff --git a/objects/oDoor.object.gmx b/objects/oDoor.object.gmx index f3d36d4..c401e31 100644 --- a/objects/oDoor.object.gmx +++ b/objects/oDoor.object.gmx @@ -210,72 +210,9 @@ if (open == 0) { } } -if(room == rm_a7b05){ - if(global.metdead[46] == 1){ - if(lock == 4){ - lock = 0; - open = 1; - } - } - if(oControl.mod_monstersextreme == 1 && global.metdead[67] == 1 && global.metdead[68] == 1 && global.metdead[81] == 1 && global.metdead[82] == 1){ - if(lock == 4){ - lock = 0; - open = 1; - } - } - if(oControl.mod_monstersextreme == 1 && oControl.mod_fusion == 1 && global.metdead[62] == 1){ - if(lock == 4){ - lock = 0; - open = 1; - } - } -} - -if(room == rm_a7b06){ - if(global.metdead[47] == 1){ - if(lock == 4){ - lock = 0; - open = 1; - } - } - if(oControl.mod_monstersextreme == 1 && global.metdead[69] == 1 && global.metdead[83] == 1 && global.metdead[70] == 1){ - if(lock == 4){ - lock = 0; - open = 1; - } - } - if((oControl.difficulty >= 2 || oControl.mod_fusion == 1 || oControl.mod_monstersextreme == 1) && global.metdead[54] == 1){ - if(lock == 4){ - lock = 0; - open = 1; - } - } -} - -if(room == rm_a7b07){ - if(global.metdead[48] == 1 && global.metdead[49] == 1){ - if(lock == 4){ - lock = 0; - open = 1; - } - } -} - -if(room == rm_a7b08){ - if(global.metdead[50] == 1 && global.metdead[51] == 1){ - if(lock == 4){ - lock = 0; - open = 1; - } - } -} - -if(room == rm_a7b08A){ - if(global.metdead[52] == 1 && global.metdead[53] == 1){ - if(lock == 4){ - lock = 0; - open = 1; - } +if(room == rm_a7b05 || room == rm_a7b06 || room == rm_a7b07 || room == rm_a7b08 || room == rm_a7b08A){ + if(instance_number(oMonster) == 0){ + event_user(3); } }