From d17f6491bcd44d6bade4e0e0028bafd98b39df0b Mon Sep 17 00:00:00 2001
From: Mae <72725655+VanessaMae1087@users.noreply.github.com>
Date: Tue, 26 Jul 2022 14:57:41 -0700
Subject: [PATCH] changed arachnus item check
---
objects/oArachnusTrigger.object.gmx | 7 +-
rooms/rm_a0h07.room.gmx | 4 -
rooms/rm_a0h09.room.gmx | 2 +-
rooms/rm_a0h10.room.gmx | 33 ++++++
rooms/rm_a0h10a.room.gmx | 2 +-
rooms/rm_a0h24.room.gmx | 137 ++++++++++++++++++++++
rooms/rm_a2a03.room.gmx | 4 +-
rooms/rm_a2a04.room.gmx | 5 +-
rooms/rm_a3a01.room.gmx | 6 +-
rooms/rm_a3b01.room.gmx | 34 +++++-
rooms/rm_a3h02.room.gmx | 39 ++++--
rooms/rm_a3h04.room.gmx | 176 +++++++++++++++++++++++++++-
rooms/rm_a4h05.room.gmx | 2 +-
rooms/rm_a4h12.room.gmx | 8 +-
rooms/rm_a5a07.room.gmx | 16 +--
scripts/spawn_rnd_pickup.gml | 2 +-
scripts/spawn_rnd_pickup_at.gml | 2 +-
17 files changed, 432 insertions(+), 47 deletions(-)
diff --git a/objects/oArachnusTrigger.object.gmx b/objects/oArachnusTrigger.object.gmx
index fbebff8..39a6bd1 100644
--- a/objects/oArachnusTrigger.object.gmx
+++ b/objects/oArachnusTrigger.object.gmx
@@ -49,9 +49,14 @@ image_yscale = 20;
1
- with (oArachnusStatue) event_user(0);
+ //if (global.item[3]) {
+if (global.item[scr_itemchange(3)])
+{
+with (oDoor) event_user(0);
+with (oArachnusStatue) event_user(0);
mus_current_fadeout();
instance_destroy();
+}
diff --git a/rooms/rm_a0h07.room.gmx b/rooms/rm_a0h07.room.gmx
index 953638e..85e194c 100644
--- a/rooms/rm_a0h07.room.gmx
+++ b/rooms/rm_a0h07.room.gmx
@@ -483,10 +483,6 @@ with(oBlockSpeed){
-
-
-
-
diff --git a/rooms/rm_a0h09.room.gmx b/rooms/rm_a0h09.room.gmx
index e72c4cc..e65e16b 100644
--- a/rooms/rm_a0h09.room.gmx
+++ b/rooms/rm_a0h09.room.gmx
@@ -455,7 +455,7 @@ global.floormaterial = 1;
-
+
diff --git a/rooms/rm_a0h10.room.gmx b/rooms/rm_a0h10.room.gmx
index 3dc2519..91ef24a 100644
--- a/rooms/rm_a0h10.room.gmx
+++ b/rooms/rm_a0h10.room.gmx
@@ -313,6 +313,7 @@ instance_create(224, 272, scr_itemsopen(oControl.mod_210));
+
@@ -617,6 +618,38 @@ instance_create(224, 272, scr_itemsopen(oControl.mod_210));
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
0
0
diff --git a/rooms/rm_a0h10a.room.gmx b/rooms/rm_a0h10a.room.gmx
index 669cf9b..2c145f3 100644
--- a/rooms/rm_a0h10a.room.gmx
+++ b/rooms/rm_a0h10a.room.gmx
@@ -361,7 +361,7 @@ mus_change(mus_get_main_song());
-
+
diff --git a/rooms/rm_a0h24.room.gmx b/rooms/rm_a0h24.room.gmx
index 7a4bf3b..f3af54b 100644
--- a/rooms/rm_a0h24.room.gmx
+++ b/rooms/rm_a0h24.room.gmx
@@ -367,6 +367,7 @@ instance_create(80, 432, scr_itemsopen(oControl.mod_54));
+
@@ -1224,6 +1225,142 @@ instance_create(80, 432, scr_itemsopen(oControl.mod_54));
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
0
0
diff --git a/rooms/rm_a2a03.room.gmx b/rooms/rm_a2a03.room.gmx
index f804d04..2f4074b 100644
--- a/rooms/rm_a2a03.room.gmx
+++ b/rooms/rm_a2a03.room.gmx
@@ -16,9 +16,7 @@ global.waterlevel = 0;
global.watertype = 0;
global.floormaterial = 4;
global.save_room = quitroom;
-if (global.event[103] > 0 && global.item[scr_itemchange(3)] == 0) {
- instance_create(112, 96, scr_itemsopen(oControl.mod_jumpball));
-}
+
//mus_change(musArea2A);
if(instance_number(oCharacter) > 0) mus_change(musArea2A);
diff --git a/rooms/rm_a2a04.room.gmx b/rooms/rm_a2a04.room.gmx
index a8b90e6..90ad8e0 100644
--- a/rooms/rm_a2a04.room.gmx
+++ b/rooms/rm_a2a04.room.gmx
@@ -69,7 +69,7 @@ if (instance_exists(inst_AAB1CA75)) { with (inst_AAB1CA75) instance_destroy(); }
-
+
@@ -80,10 +80,11 @@ if (instance_exists(inst_AAB1CA75)) { with (inst_AAB1CA75) instance_destroy(); }
-
+
+
diff --git a/rooms/rm_a3a01.room.gmx b/rooms/rm_a3a01.room.gmx
index f5c1474..53c255e 100644
--- a/rooms/rm_a3a01.room.gmx
+++ b/rooms/rm_a3a01.room.gmx
@@ -61,7 +61,7 @@ mus_change_itemroom();
-
+
@@ -76,8 +76,8 @@ mus_change_itemroom();
-
-
+
+
diff --git a/rooms/rm_a3b01.room.gmx b/rooms/rm_a3b01.room.gmx
index 8c6f325..d3823d5 100644
--- a/rooms/rm_a3b01.room.gmx
+++ b/rooms/rm_a3b01.room.gmx
@@ -3,8 +3,8 @@
960
240
- 32
- 32
+ 16
+ 16
0
60
0
@@ -237,8 +237,34 @@ mus_change(musCaveAmbience);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -504,6 +530,10 @@ mus_change(musCaveAmbience);
+
+
+
+
0
0
diff --git a/rooms/rm_a3h02.room.gmx b/rooms/rm_a3h02.room.gmx
index df047b5..c93c1c2 100644
--- a/rooms/rm_a3h02.room.gmx
+++ b/rooms/rm_a3h02.room.gmx
@@ -12,7 +12,7 @@
0
global.mapoffsetx = 53;
global.mapoffsety = 22;
-if (global.lavastate <= 2) make_liquid(1, 1012, 0, 0, 0, 0, 1);
+if (global.lavastate <= 2) make_liquid(1, 740, 0, 0, 0, 0, 1);
global.floormaterial = 3;
global.darkness = 0;
global.objdeactivate = 1;
@@ -134,9 +134,10 @@ mus_change(musCaveAmbience);
-
-
-
+
+
+
+
@@ -153,9 +154,6 @@ mus_change(musCaveAmbience);
-
-
-
@@ -194,6 +192,33 @@ mus_change(musCaveAmbience);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rooms/rm_a3h04.room.gmx b/rooms/rm_a3h04.room.gmx
index a18f45e..ecb06ef 100644
--- a/rooms/rm_a3h04.room.gmx
+++ b/rooms/rm_a3h04.room.gmx
@@ -16,6 +16,7 @@ global.watertype = 0;
global.waterlevel = 0;
global.floormaterial = 3;
global.objdeactivate = 1;
+if (global.lavastate <= 2) make_liquid(1, 1333, 0, 0, 0, 0, 1);
if (file_exists("musItemAmb2.ogg")) {
if(oMusicV2.currentbgm == musItemAmb2) {
if (oMusicV2.previousbgm == musArea3A) mus_change(musArea3A);
@@ -782,11 +783,29 @@ instance_create(64, 1648, scr_itemsopen(oControl.mod_211));
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1477,6 +1496,7 @@ instance_create(64, 1648, scr_itemsopen(oControl.mod_211));
+
@@ -4977,6 +4997,160 @@ instance_create(64, 1648, scr_itemsopen(oControl.mod_211));
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
0
0
diff --git a/rooms/rm_a4h05.room.gmx b/rooms/rm_a4h05.room.gmx
index a715d1e..6d242b8 100644
--- a/rooms/rm_a4h05.room.gmx
+++ b/rooms/rm_a4h05.room.gmx
@@ -12,7 +12,7 @@
0
global.mapoffsetx = 38;
global.mapoffsety = 37;
-if (global.lavastate <= 6) make_liquid(1, 227, 0, 0, 0, 0, 1);
+if (global.lavastate <= 5) make_liquid(1, 227, 0, 0, 0, 0, 1);
global.floormaterial = 1;
-1
-1
diff --git a/rooms/rm_a4h12.room.gmx b/rooms/rm_a4h12.room.gmx
index 28f3856..b63a87d 100644
--- a/rooms/rm_a4h12.room.gmx
+++ b/rooms/rm_a4h12.room.gmx
@@ -12,7 +12,7 @@
0
global.mapoffsetx = 28;
global.mapoffsety = 41;
-if (global.lavastate <= 6) make_liquid(1, 183, 0, 0, 0, 0, 1);
+if (global.lavastate <= 5) make_liquid(1, 183, 0, 0, 0, 0, 1);
global.floormaterial = 1;
-1
-1
@@ -157,13 +157,13 @@ global.floormaterial = 1;
-
-
+
+
-
+
diff --git a/rooms/rm_a5a07.room.gmx b/rooms/rm_a5a07.room.gmx
index 7366f56..28041ab 100644
--- a/rooms/rm_a5a07.room.gmx
+++ b/rooms/rm_a5a07.room.gmx
@@ -75,23 +75,11 @@ if (oControl.mod_gravity != 9) instance_create(152, 160, scr_itemsopen(oControl.
-
-
-
+
-
-
-
-
-
-
-
-
-
-
@@ -142,8 +130,6 @@ if (oControl.mod_gravity != 9) instance_create(152, 160, scr_itemsopen(oControl.
-
-
diff --git a/scripts/spawn_rnd_pickup.gml b/scripts/spawn_rnd_pickup.gml
index 2619c3b..fdae105 100644
--- a/scripts/spawn_rnd_pickup.gml
+++ b/scripts/spawn_rnd_pickup.gml
@@ -12,7 +12,7 @@ if (random(100) < argument0) {
spawnX = irandom(1); // 50% chance to Spawn an X even if health, missles, and supers are full.
}
- if ((global.item[0] == 0 && global.maxpbombs > 0) || oControl.mod_insanitymode == 1) pickup = irandom(4);
+ if (global.maxpbombs > 0) pickup = irandom(4);
if (pickup == 0) {
if ((global.playerhealth < global.maxhealth && instance_number(oHPickup) < 6) || (oControl.mod_fusion == 1 && spawnX == 1 && canbeX && instance_number(oHPickup) < 6)) {
diff --git a/scripts/spawn_rnd_pickup_at.gml b/scripts/spawn_rnd_pickup_at.gml
index 62fde3c..cfbdab3 100644
--- a/scripts/spawn_rnd_pickup_at.gml
+++ b/scripts/spawn_rnd_pickup_at.gml
@@ -40,7 +40,7 @@ if (random(100) <= argument2) {
xParasite = instance_create(argument0, argument1, oSMXPickup);
}
else instance_create(argument0, argument1, oSMPickup);
- } else if ((global.item[0] == 0 && global.maxpbombs > 0) || oControl.mod_insanitymode == 1) pickup = 4;
+ } else if ((global.maxpbombs > 0) || oControl.mod_insanitymode == 1) pickup = 4;
}
if (sprite_index != sQueenProjFrozen && instance_exists(xParasite) && oControl.mod_fusion == 1) {
PlaySoundMono(sndXMorph2);