Enemy rando, let enemies air walk over voidout floor in clear rooms (#7005)

Behind a setting

Add timed rooms + Fire Temple modifications

soh/soh/Enhancements/ExtraModes/EnemyRandomizer.cpp

@@ -229,9 +229,9 @@ static bool IsClearRoom(bool mq, s16 sceneNum, s8 roomNum) {
             }
         case SCENE_FIRE_TEMPLE:
             if (mq) {
-                return roomNum == 15 || roomNum == 17 || roomNum == 18;
+                return roomNum == 15 || roomNum == 17 || roomNum == 18 || roomNum == 24;
             } else {
-                return roomNum == 15;
+                return roomNum == 3 || roomNum == 15 || roomNum == 24;
             }
         case SCENE_WATER_TEMPLE:
             if (mq) {
@@ -986,6 +986,45 @@ void RegisterEnemyRandomizer() {
         *should = false;
     });
 
+    COND_VB_SHOULD(VB_AFTER_ACTOR_UPDATE_BGCHECKINFO, ENEMY_RANDOMIZER_ENABLED, {
+        Actor* enemy = va_arg(args, Actor*);
+        Player* player = GET_PLAYER(gPlayState);
+
+        if (enemy->category != ACTORCAT_ENEMY) {
+            return;
+        }
+
+        if ((IsClearRoom(ResourceMgr_IsSceneMasterQuest(gPlayState->sceneNum), gPlayState->sceneNum,
+                         gPlayState->roomCtx.curRoom.num) ||
+             IsTimedRoom(ResourceMgr_IsSceneMasterQuest(gPlayState->sceneNum), gPlayState->sceneNum,
+                         gPlayState->roomCtx.curRoom.num)) &&
+            enemy->id != ACTOR_EN_FIREFLY && enemy->id != ACTOR_EN_CROW) {
+            u32 floorProperty = func_80041EA4(&gPlayState->colCtx, enemy->floorPoly, enemy->floorBgId);
+
+            // Let ground enemies air walk above voidout floor in clear/timed rooms
+            // and move them up if setting is enabled after they're fallen down
+            if (CVarGetInteger(CVAR_ENHANCEMENT("EnemyRandomizerAirWalkVoidouts"), false) &&
+                (SurfaceType_GetFloorType(&gPlayState->colCtx, enemy->floorPoly, enemy->floorBgId) == 9 ||
+                 floorProperty == FLOOR_PROPERTY_5 || floorProperty == FLOOR_PROPERTY_12)) {
+                if (enemy->world.pos.y < player->actor.floorHeight) {
+                    Math_StepToF(&enemy->world.pos.y, player->actor.floorHeight, 12.0f);
+                    enemy->velocity.y = 0.0f;
+                }
+            }
+            // Backup. If player really above enemy, probably fallen out of bounds
+            // Extra distance for Flare Dancer elevator platform room (if spawning top in doorsanity)
+            f32 killHeight = (gPlayState->sceneNum == SCENE_FIRE_TEMPLE && gPlayState->roomCtx.curRoom.num == 24)
+                                 ? (player->actor.world.pos.y - 1500.0f)
+                                 : (player->actor.world.pos.y - 1000.0f);
+            if (enemy->world.pos.y < killHeight) {
+                LUSLOG_INFO(
+                    "AfterActorUpdateBgCheckInfo: Killing enemy, out of bounds (id 0x%x, pos x %.1f y %.1f z %.1f)",
+                    enemy->id, enemy->world.pos.x, enemy->world.pos.y, enemy->world.pos.z);
+                Actor_Kill(enemy);
+            }
+        }
+    });
+
     COND_VB_SHOULD(VB_HAKA_HUTA_SPAWN_KEESE, ENEMY_RANDOMIZER_ENABLED, {
         BgHakaHuta* hakaHuta = va_arg(args, BgHakaHuta*);
         PlayState* play = va_arg(args, PlayState*);
@@ -1131,6 +1170,13 @@ void RegisterEnemyRandomizerWidgets() {
         .Options(UIWidgets::CheckboxOptions().Tooltip("Scales normal enemies Health with their randomized size.\n"
                                                       "*This will NOT affect Bosses!*"));
 
+    SohGui::mSohMenu->AddWidget(path, "Enemies Walk over Voidout Pits", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("EnemyRandomizerAirWalkVoidouts"))
+        .Options(
+            UIWidgets::CheckboxOptions().Tooltip("Ground enemies will air walk over pits/floors that void out Link\n"
+                                                 "to prevent softlocks. Can be toggled to make enemies fall down\n"
+                                                 "or fly back up from a void pit."));
+
     SohGui::mSohMenu->AddWidget(path, "Enemy List", WIDGET_SEPARATOR_TEXT).PreFunc([](WidgetInfo& info) {
         info.isHidden = !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0);
     });

soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h

@@ -3512,6 +3512,14 @@ typedef enum {
     // - `*PlayState`
     VB_MORI_BIGST_SUMMON_STALFOS_PAIR,
 
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*Actor`
+    VB_AFTER_ACTOR_UPDATE_BGCHECKINFO,
+
     // #### `result`
     // ```c
     // true

soh/src/code/z_actor.c

@@ -1750,6 +1750,8 @@ void Actor_UpdateBgCheckInfo(PlayState* play, Actor* actor, f32 wallCheckHeight,
             actor->yDistToWater = BGCHECK_Y_MIN;
         }
     }
+
+    GameInteractor_Should(VB_AFTER_ACTOR_UPDATE_BGCHECKINFO, true, actor);
 }
 
 Mtx D_8015BBA8;