Merge branch 'dev' into main

objects/oDoor.object.gmx

@@ -211,19 +211,7 @@ 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(instance_number(oMonster) == 0){
         if(lock == 4){
             lock = 0;
             open = 1;
@@ -232,19 +220,7 @@ if(room == rm_a7b05){
 }
 
 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(instance_number(oMonster) == 0){
         if(lock == 4){
             lock = 0;
             open = 1;
@@ -253,7 +229,7 @@ if(room == rm_a7b06){
 }
 
 if(room == rm_a7b07){
-    if(global.metdead[48] == 1 && global.metdead[49] == 1){
+    if(instance_number(oMonster) == 0){
         if(lock == 4){
             lock = 0;
             open = 1;
@@ -262,7 +238,7 @@ if(room == rm_a7b07){
 }
 
 if(room == rm_a7b08){
-    if(global.metdead[50] == 1 && global.metdead[51] == 1){
+    if(instance_number(oMonster) == 0){
         if(lock == 4){
             lock = 0;
             open = 1;
@@ -271,7 +247,7 @@ if(room == rm_a7b08){
 }
 
 if(room == rm_a7b08A){
-    if(global.metdead[52] == 1 && global.metdead[53] == 1){
+    if(instance_number(oMonster) == 0){
         if(lock == 4){
             lock = 0;
             open = 1;