Archive/Shipwright
0
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-04-28 13:17:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow seeded enemy rando to use the values of the enemy list selection. (#5371)

Browse source
This commit is contained in:
Malkierian 2025-04-09 15:18:44 -07:00 • committed by GitHub
parent c12349a7a3
commit a99e8836fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
soh/soh/Enhancements/enemyrandomizer.cpp
View file

@ -318,11 +318,10 @@ extern "C" uint8_t GetRandomizedEnemy(PlayState* play, int16_t* actorId, f32* po
return 1;
}
std::vector<EnemyEntry> selectedEnemyList;
static std::vector<EnemyEntry> selectedEnemyList;
void GetSelectedEnemies() {
selectedEnemyList.clear();
if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), ENEMY_RANDOMIZER_OFF) == ENEMY_RANDOMIZER_RANDOM) {
for (int i = 0; i < 49; i++) {
if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemyList.All"), 0)) {
selectedEnemyList.push_back(randomizedEnemySpawnTable[i]);
@ -333,11 +332,6 @@ void GetSelectedEnemies() {
if (selectedEnemyList.size() == 0) {
selectedEnemyList.push_back(randomizedEnemySpawnTable[0]);
}
} else {
for (int i = 0; i < 49; i++) {
selectedEnemyList.push_back(randomizedEnemySpawnTable[i]);
}
}
}
EnemyEntry GetRandomizedEnemyEntry(uint32_t seed) {
@ -348,7 +342,7 @@ EnemyEntry GetRandomizedEnemyEntry(uint32_t seed) {
uint32_t finalSeed =
seed + (IS_RANDO ? Rando::Context::GetInstance()->GetSeed() : gSaveContext.ship.stats.fileCreatedAt);
Random_Init(finalSeed);
uint32_t randomNumber = Random(0, RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE);
uint32_t randomNumber = Random(0, selectedEnemyList.size());
return selectedEnemyList[randomNumber];
} else {
uint32_t randomSelectedEnemy = Random(0, selectedEnemyList.size());