From 4ba53aaa9d70c8609b58229ef5c56978459d0e89 Mon Sep 17 00:00:00 2001 From: milesthenerd Date: Mon, 11 Jan 2021 12:01:46 -0600 Subject: [PATCH] Revert "Getting locked in final metroid rooms should no longer be possible" This reverts commit 5b74de42a74a35d87ef8ba684706f859d5674d2f. --- objects/oDoor.object.gmx | 69 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 3 deletions(-) diff --git a/objects/oDoor.object.gmx b/objects/oDoor.object.gmx index c401e317..f3d36d4a 100644 --- a/objects/oDoor.object.gmx +++ b/objects/oDoor.object.gmx @@ -210,9 +210,72 @@ if (open == 0) { } } -if(room == rm_a7b05 || room == rm_a7b06 || room == rm_a7b07 || room == rm_a7b08 || room == rm_a7b08A){ - if(instance_number(oMonster) == 0){ - event_user(3); +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; + } } }