Chaos Race Build

.github/workflows/generate-builds.yml

@@ -276,7 +276,7 @@ jobs:
       if: ${{ !vars.WINDOWS_RUNNER }}
       run: |
         choco install ninja
-        Remove-Item -Path "C:\ProgramData\Chocolatey\bin\ccache.exe" -Force
+        Remove-Item -Path "C:\ProgramData\Chocolatey\bin\ccache.exe" -Force -ErrorAction SilentlyContinue
     - uses: actions/checkout@v3
       with:
         submodules: true

soh/soh/Enhancements/enemyrandomizer.cpp

@@ -12,55 +12,23 @@ extern "C" {
 extern "C" uint32_t ResourceMgr_IsSceneMasterQuest(s16 sceneNum);
 
 static EnemyEntry randomizedEnemySpawnTable[RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE] = {
-    { ACTOR_EN_FIREFLY, 2 },    // Regular Keese
     { ACTOR_EN_FIREFLY, 1 },    // Fire Keese
     { ACTOR_EN_FIREFLY, 4 },    // Ice Keese
     { ACTOR_EN_TEST, 2 },       // Stalfos
-    { ACTOR_EN_TITE, -1 },      // Tektite (red)
-    { ACTOR_EN_TITE, -2 },      // Tektite (blue)
-    { ACTOR_EN_WALLMAS, 1 },    // Wallmaster
-    { ACTOR_EN_DODONGO, -1 },   // Dodongo
     { ACTOR_EN_PEEHAT, -1 },    // Flying Peahat (big grounded, doesn't spawn larva)
-    { ACTOR_EN_PEEHAT, 1 },     // Flying Peahat Larva
     { ACTOR_EN_ZF, -1 },        // Lizalfos
-    { ACTOR_EN_ZF, -2 },        // Dinolfos
-    { ACTOR_EN_GOMA, 7 },       // Gohma larva (non-gohma rooms)
-    { ACTOR_EN_BUBBLE, 0 },     // Shabom (bubble)
-    { ACTOR_EN_DODOJR, 0 },     // Baby Dodongo
-    { ACTOR_EN_TORCH2, 0 },     // Dark Link
-    { ACTOR_EN_BILI, 0 },       // Biri (jellyfish)
-    { ACTOR_EN_TP, -1 },        // Electric Tailparasan
-    { ACTOR_EN_ST, 0 },         // Skulltula (normal)
-    { ACTOR_EN_ST, 1 },         // Skulltula (big)
     { ACTOR_EN_ST, 2 },         // Skulltula (invisible)
     { ACTOR_EN_BW, 0 },         // Torch Slug
-    { ACTOR_EN_EIYER, 10 },     // Stinger (land) (One in formation, sink under floor and do not activate)
     { ACTOR_EN_MB, 0 },         // Moblins (Club)
-    { ACTOR_EN_DEKUBABA, 0 },   // Deku Baba (small)
-    { ACTOR_EN_DEKUBABA, 1 },   // Deku Baba (large)
-    { ACTOR_EN_AM, -1 },        // Armos (enemy variant)
-    { ACTOR_EN_DEKUNUTS, 768 }, // Mad Scrub (triple attack) (projectiles don't work)
-    { ACTOR_EN_VALI, -1 },      // Bari (big jellyfish)
-    { ACTOR_EN_BB, -1 },        // Bubble (flying skull enemy) (blue)
     { ACTOR_EN_YUKABYUN, 0 },   // Flying Floor Tile
-    { ACTOR_EN_VM, 1280 },      // Beamos
     { ACTOR_EN_FLOORMAS, 0 },   // Floormaster
-    { ACTOR_EN_RD, 1 },         // Redead (standing)
     { ACTOR_EN_RD, 32766 },     // Gibdo (standing)
-    { ACTOR_EN_SB, 0 },         // Shell Blade
-    { ACTOR_EN_KAREBABA, 0 },   // Withered Deku Baba
     { ACTOR_EN_RR, 0 },         // Like-Like
     { ACTOR_EN_NY, 0 },         // Spike (rolling enemy)
-    { ACTOR_EN_IK, 2 },         // Iron Knuckle (black, standing)
     { ACTOR_EN_IK, 3 },         // Iron Knuckle (white, standing)
     { ACTOR_EN_TUBO_TRAP, 0 },  // Flying pot
-    { ACTOR_EN_FZ, 0 },         // Freezard
     { ACTOR_EN_CLEAR_TAG, 1 },  // Arwing
-    { ACTOR_EN_WF, 0 },         // Wolfos (normal)
     { ACTOR_EN_WF, 1 },         // Wolfos (white)
-    { ACTOR_EN_SKB, 1 },        // Stalchild (small)
-    { ACTOR_EN_SKB, 20 },       // Stalchild (big)
-    { ACTOR_EN_CROW, 0 }        // Guay
 
     // Doesn't work {ACTOR_EN_POH, 0}, // Poe (Seems to rely on other objects?)
     // Doesn't work {ACTOR_EN_POH, 2}, // Poe (composer Sharp) (Seems to rely on other objects?)

soh/soh/Enhancements/enemyrandomizer.h

@@ -7,7 +7,7 @@ typedef struct EnemyEntry {
     int16_t params;
 } EnemyEntry;
 
-#define RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE 49
+#define RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE 17
 
 bool IsEnemyFoundToRandomize(int16_t sceneNum, int8_t roomNum, int16_t actorId, int16_t params, float posX);
 bool IsEnemyAllowedToSpawn(int16_t sceneNum, int8_t roomNum, EnemyEntry enemy);

soh/soh/Enhancements/game-interactor/GameInteractor.h

@@ -83,6 +83,11 @@ uint8_t GameInteractor_GetRandomWindActive();
 uint8_t GameInteractor_GetRandomBonksActive();
 uint8_t GameInteractor_GetSlipperyFloorActive();
 uint8_t GameInteractor_SecondCollisionUpdate();
+uint8_t GameInteractor_RotatingLink();
+uint8_t GameInteractor_SpazzingLink();
+void GameInteractor_SpawnCuccoStorm();
+void GameInteractor_SetRandomInvertedAxis();
+void GameInteractor_ToggleSlipperyFloor();
 #ifdef __cplusplus
 }
 #endif
@@ -123,6 +128,8 @@ class GameInteractor {
         static uint8_t RandomBonksActive;
         static uint8_t SlipperyFloorActive;
         static uint8_t SecondCollisionUpdate;
+        static uint8_t RotatingLink;
+        static uint8_t SpazzingLink;
 
         static void SetPacifistMode(bool active);
     };

soh/soh/Enhancements/game-interactor/GameInteractor_State.cpp

@@ -1,4 +1,5 @@
 #include "GameInteractor.h"
+#include "libultraship/libultraship.h"
 
 // MARK: - State Definitions
 
@@ -20,6 +21,8 @@ uint8_t GameInteractor::State::RandomWindSecondsSinceLastDirectionChange = 0;
 uint8_t GameInteractor::State::RandomBonksActive = 0;
 uint8_t GameInteractor::State::SlipperyFloorActive = 0;
 uint8_t GameInteractor::State::SecondCollisionUpdate = 0;
+uint8_t GameInteractor::State::RotatingLink = 0;
+uint8_t GameInteractor::State::SpazzingLink = 0;
 
 void GameInteractor::State::SetPacifistMode(bool active) {
     PacifistModeActive = active;
@@ -127,3 +130,30 @@ uint8_t GameInteractor_GetSlipperyFloorActive() {
 uint8_t GameInteractor_SecondCollisionUpdate() {
     return GameInteractor::State::SecondCollisionUpdate;
 }
+
+// MARK: - GameInteractor::State::RotatingLink
+uint8_t GameInteractor_RotatingLink() {
+    return GameInteractor::State::RotatingLink;
+}
+
+// MARK: - GameInteractor::State::SpazzingLink
+uint8_t GameInteractor_SpazzingLink() {
+    return GameInteractor::State::SpazzingLink;
+}
+
+// MARK: - 
+void GameInteractor_SpawnCuccoStorm() {
+    GameInteractor::RawAction::SpawnActor(25, 0);
+}
+
+// MARK: - 
+void GameInteractor_SetRandomInvertedAxis() {
+    uint32_t randomNumber1 = rand() % 2;
+    uint32_t randomNumber2 = rand() % 2;
+    CVarSetInteger("gInvertAimingXAxis", randomNumber1);
+    CVarSetInteger("gInvertAimingYAxis", randomNumber2);
+}
+
+void GameInteractor_ToggleSlipperyFloor() {
+    GameInteractor::State::SlipperyFloorActive ^= 1;
+}