diff options
| author | sitton76 <58642183+sitton76@users.noreply.github.com> | 2026-01-29 07:14:07 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-29 08:14:07 -0500 |
| commit | d80a5cf2e8b5bfefd83fb55f38afd4fee92097a5 (patch) | |
| tree | 906b737c4d1bce8cde68a032dae3588386e64639 | |
| parent | 9801ddac411000cb5d5f7f3323457862cbb1c485 (diff) | |
Added CanKillEnemy condition for ENEMY_DROP_GIANT_BEE checks (#1515)
| -rw-r--r-- | mm/2s2h/Rando/Logic/Regions/SpiderHouses.cpp | 4 | ||||
| -rw-r--r-- | mm/2s2h/Rando/Logic/Regions/TerminaField.cpp | 4 | ||||
| -rw-r--r-- | mm/2s2h/Rando/Logic/Regions/West.cpp | 2 | ||||
| -rw-r--r-- | mm/2s2h/Rando/Logic/Regions/WoodfallTemple.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/mm/2s2h/Rando/Logic/Regions/SpiderHouses.cpp b/mm/2s2h/Rando/Logic/Regions/SpiderHouses.cpp index a830ece3a..cd603cd3e 100644 --- a/mm/2s2h/Rando/Logic/Regions/SpiderHouses.cpp +++ b/mm/2s2h/Rando/Logic/Regions/SpiderHouses.cpp @@ -125,7 +125,7 @@ static RegisterShipInitFunc initFunc([]() { CHECK(RC_SWAMP_SPIDER_HOUSE_JAR_ROOM_POT_03, true), CHECK(RC_SWAMP_SPIDER_HOUSE_JAR_ROOM_POT_04, true), CHECK(RC_SWAMP_SPIDER_HOUSE_JAR_ROOM_POT_05, true), - CHECK(RC_ENEMY_DROP_GIANT_BEE, CAN_USE_PROJECTILE), // In beehive + CHECK(RC_ENEMY_DROP_GIANT_BEE, CAN_USE_PROJECTILE && CanKillEnemy(ACTOR_EN_BEE)), // In beehive }, .connections = { CONNECTION(RR_SWAMP_SPIDER_HOUSE_CENTER_ROOM_LOWER, true), @@ -259,7 +259,7 @@ static RegisterShipInitFunc initFunc([]() { CHECK(RC_SWAMP_SKULLTULA_TREE_ROOM_TREE_01, CanKillEnemy(ACTOR_EN_SW)), CHECK(RC_SWAMP_SKULLTULA_TREE_ROOM_TREE_02, CanKillEnemy(ACTOR_EN_SW)), CHECK(RC_SWAMP_SKULLTULA_TREE_ROOM_TREE_03, CanKillEnemy(ACTOR_EN_SW)), - CHECK(RC_ENEMY_DROP_GIANT_BEE, CAN_USE_PROJECTILE), // In beehive + CHECK(RC_ENEMY_DROP_GIANT_BEE, CAN_USE_PROJECTILE && CanKillEnemy(ACTOR_EN_BEE)), // In beehive }, .connections = { CONNECTION(RR_SWAMP_SPIDER_HOUSE_GOLD_ROOM_UPPER, true) diff --git a/mm/2s2h/Rando/Logic/Regions/TerminaField.cpp b/mm/2s2h/Rando/Logic/Regions/TerminaField.cpp index 045c707b7..2f02b917d 100644 --- a/mm/2s2h/Rando/Logic/Regions/TerminaField.cpp +++ b/mm/2s2h/Rando/Logic/Regions/TerminaField.cpp @@ -110,7 +110,7 @@ static RegisterShipInitFunc initFunc([]() { CHECK(RC_TERMINA_FIELD_COW_GROTTO_GRASS_70, true), CHECK(RC_TERMINA_FIELD_COW_GROTTO_GRASS_71, true), CHECK(RC_TERMINA_FIELD_COW_GROTTO_GRASS_72, true), - CHECK(RC_ENEMY_DROP_GIANT_BEE, CAN_USE_PROJECTILE), // In a beehive + CHECK(RC_ENEMY_DROP_GIANT_BEE, CAN_USE_PROJECTILE && CanKillEnemy(ACTOR_EN_BEE)), // In a beehive }, .connections = { CONNECTION(RR_TERMINA_FIELD, true), // TODO: Grotto mapping @@ -153,7 +153,7 @@ static RegisterShipInitFunc initFunc([]() { CHECK(RC_TERMINA_FIELD_GOSSIP_STONE_GROTTO_3_GRASS_03, true), CHECK(RC_TERMINA_FIELD_GOSSIP_STONE_GROTTO_3_GRASS_04, true), CHECK(RC_TERMINA_FIELD_GOSSIP_STONE_GROTTO_3_GRASS_05, true), - CHECK(RC_ENEMY_DROP_GIANT_BEE, CAN_USE_PROJECTILE), // In a beehive + CHECK(RC_ENEMY_DROP_GIANT_BEE, CAN_USE_PROJECTILE && CanKillEnemy(ACTOR_EN_BEE)), // In a beehive }, .exits = { // TO FROM EXIT(ENTRANCE(TERMINA_FIELD, 0), ENTRANCE(GROTTOS, 0), true), // TODO: Grotto mapping diff --git a/mm/2s2h/Rando/Logic/Regions/West.cpp b/mm/2s2h/Rando/Logic/Regions/West.cpp index 962e36bfa..a2725f8e8 100644 --- a/mm/2s2h/Rando/Logic/Regions/West.cpp +++ b/mm/2s2h/Rando/Logic/Regions/West.cpp @@ -92,7 +92,7 @@ static RegisterShipInitFunc initFunc([]() { CHECK(RC_GREAT_BAY_COAST_COW_GROTTO_GRASS_70, true), CHECK(RC_GREAT_BAY_COAST_COW_GROTTO_GRASS_71, true), CHECK(RC_GREAT_BAY_COAST_COW_GROTTO_GRASS_72, true), - CHECK(RC_ENEMY_DROP_GIANT_BEE, CAN_USE_PROJECTILE), // In a beehive + CHECK(RC_ENEMY_DROP_GIANT_BEE, CAN_USE_PROJECTILE && CanKillEnemy(ACTOR_EN_BEE)), // In a beehive }, .connections = { CONNECTION(RR_GREAT_BAY_COAST_CLIFFSIDE, true), // TODO: Grotto mapping diff --git a/mm/2s2h/Rando/Logic/Regions/WoodfallTemple.cpp b/mm/2s2h/Rando/Logic/Regions/WoodfallTemple.cpp index e77788279..7495286b0 100644 --- a/mm/2s2h/Rando/Logic/Regions/WoodfallTemple.cpp +++ b/mm/2s2h/Rando/Logic/Regions/WoodfallTemple.cpp @@ -149,7 +149,7 @@ static RegisterShipInitFunc initFunc([]() { CHECK(RC_WOODFALL_TEMPLE_SF_MAZE_BUBBLE, true), CHECK(RC_WOODFALL_TEMPLE_SF_MAZE_SKULLTULA, CanKillEnemy(ACTOR_EN_ST)), CHECK(RC_ENEMY_DROP_SKULLTULA, CanKillEnemy(ACTOR_EN_ST)), - CHECK(RC_ENEMY_DROP_GIANT_BEE, CAN_USE_PROJECTILE), // In a beehive + CHECK(RC_ENEMY_DROP_GIANT_BEE, CAN_USE_PROJECTILE && CanKillEnemy(ACTOR_EN_BEE)), // In a beehive }, .connections = { CONNECTION(RR_WOODFALL_TEMPLE_MAIN_ROOM, KEY_COUNT(WOODFALL_TEMPLE) >= 1), |