ihateninjas/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-04-23 08:14:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix cosmetic/audio randomizing options being seeded when they shouldn't be (#6481)

Browse source
This commit is contained in:
Philip Dubé 2026-04-12 18:25:05 +00:00 committed by GitHub
parent 568813a2a4
commit 8513fd8800
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
soh/soh/Enhancements/audio/AudioEditor.cpp
View file

@ -109,19 +109,22 @@ void UpdateCurrentBGM(u16 seqKey, SeqType seqType) {
} }
} }
static uint64_t seeded_audio_state = 0;
void RandomizeGroup(SeqType type, bool manual = true) { void RandomizeGroup(SeqType type, bool manual = true) {
std::vector<u16> values; std::vector<u16> values;
uint64_t localRngState = 0;
uint64_t* shuffleState = nullptr;
if (!manual) { if (!manual) {
if (CVarGetInteger(CVAR_AUDIO("RandomizeAudioGenModes"), 0) == RANDOMIZE_ON_FILE_LOAD_SEEDED || int randomizeMode = CVarGetInteger(CVAR_AUDIO("RandomizeAudioGenModes"), 0);
CVarGetInteger(CVAR_AUDIO("RandomizeAudioGenModes"), 0) == RANDOMIZE_ON_RANDO_GEN_ONLY) { if (randomizeMode == RANDOMIZE_ON_FILE_LOAD_SEEDED || randomizeMode == RANDOMIZE_ON_RANDO_GEN_ONLY) {
uint32_t finalSeed = type + (IS_RANDO ? Rando::Context::GetInstance()->GetSeed() uint32_t finalSeed = type + (IS_RANDO ? Rando::Context::GetInstance()->GetSeed()
: static_cast<uint32_t>(gSaveContext.ship.stats.fileCreatedAt)); : static_cast<uint32_t>(gSaveContext.ship.stats.fileCreatedAt));
ShipUtils::RandInit(finalSeed, &seeded_audio_state); ShipUtils::RandInit(finalSeed, &localRngState);
shuffleState = &localRngState;
} }
// For RANDOMIZE_ON_NEW_SCENE, shuffleState remains nullptr, which uses the global RNG
} }
// An empty IncludedSequences set means that the AudioEditor window has never been drawn // An empty IncludedSequences set means that the AudioEditor window has never been drawn
@ -141,7 +144,7 @@ void RandomizeGroup(SeqType type, bool manual = true) {
if (!values.size()) if (!values.size())
return; return;
} }
ShipUtils::Shuffle(values, &seeded_audio_state); ShipUtils::Shuffle(values, shuffleState);
for (const auto& [seqId, seqData] : AudioCollection::Instance->GetAllSequences()) { for (const auto& [seqId, seqData] : AudioCollection::Instance->GetAllSequences()) {
const std::string cvarKey = AudioCollection::Instance->GetCvarKey(seqData.sfxKey); const std::string cvarKey = AudioCollection::Instance->GetCvarKey(seqData.sfxKey);
const std::string cvarLockKey = AudioCollection::Instance->GetCvarLockKey(seqData.sfxKey); const std::string cvarLockKey = AudioCollection::Instance->GetCvarLockKey(seqData.sfxKey);

26
soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
View file

@ -2104,24 +2104,28 @@ void ApplySideEffects(CosmeticOption& cosmeticOption) {
} }
} }
static uint64_t seeded_cosmetics_state = 0;
void RandomizeColor(CosmeticOption& cosmeticOption, bool manual = true) { void RandomizeColor(CosmeticOption& cosmeticOption, bool manual = true) {
ImVec4 randomColor; ImVec4 randomColor;
if (!manual && CVarGetInteger(CVAR_COSMETIC("RandomizeCosmeticsGenModes"), 0) == RANDOMIZE_ON_FILE_LOAD_SEEDED || uint64_t local_seed_state = 0;
!manual && CVarGetInteger(CVAR_COSMETIC("RandomizeCosmeticsGenModes"), 0) == RANDOMIZE_ON_RANDO_GEN_ONLY) { uint64_t* randomState = nullptr;
uint32_t finalSeed = cosmeticOption.defaultColor.r + cosmeticOption.defaultColor.g + if (!manual) {
cosmeticOption.defaultColor.b + cosmeticOption.defaultColor.a + int randomizeMode = CVarGetInteger(CVAR_COSMETIC("RandomizeCosmeticsGenModes"), 0);
(IS_RANDO ? Rando::Context::GetInstance()->GetSeed() if (randomizeMode == RANDOMIZE_ON_FILE_LOAD_SEEDED || randomizeMode == RANDOMIZE_ON_RANDO_GEN_ONLY) {
: static_cast<uint32_t>(gSaveContext.ship.stats.fileCreatedAt));
randomColor = GetRandomValue(finalSeed, &seeded_cosmetics_state); uint32_t finalSeed = cosmeticOption.defaultColor.r + cosmeticOption.defaultColor.g +
} else { cosmeticOption.defaultColor.b + cosmeticOption.defaultColor.a +
randomColor = GetRandomValue(); (IS_RANDO ? Rando::Context::GetInstance()->GetSeed()
: static_cast<uint32_t>(gSaveContext.ship.stats.fileCreatedAt));
randomState = &local_seed_state;
ShipUtils::RandInit(finalSeed, randomState);
}
// For RANDOMIZE_ON_NEW_SCENE, randomState remains nullptr, which uses the global RNG
} }
randomColor = GetRandomValue(randomState);
Color_RGBA8 newColor; Color_RGBA8 newColor;
newColor.r = static_cast<uint8_t>(randomColor.x * 255.0f); newColor.r = static_cast<uint8_t>(randomColor.x * 255.0f);
newColor.g = static_cast<uint8_t>(randomColor.y * 255.0f); newColor.g = static_cast<uint8_t>(randomColor.y * 255.0f);

11
soh/soh/SohGui/UIWidgets.cpp
View file

@ -1250,16 +1250,7 @@ bool CVarBtnSelector(const char* label, const char* cvarName, const BtnSelectorO
} }
} // namespace UIWidgets } // namespace UIWidgets
ImVec4 GetRandomValue() { ImVec4 GetRandomValue(uint64_t* state) {
ImVec4 NewColor;
NewColor.x = (float)ShipUtils::RandomDouble();
NewColor.y = (float)ShipUtils::RandomDouble();
NewColor.z = (float)ShipUtils::RandomDouble();
return NewColor;
}
ImVec4 GetRandomValue(uint32_t seed, uint64_t* state) {
ShipUtils::RandInit(seed, state);
ImVec4 NewColor; ImVec4 NewColor;
NewColor.x = (float)ShipUtils::RandomDouble(state); NewColor.x = (float)ShipUtils::RandomDouble(state);
NewColor.y = (float)ShipUtils::RandomDouble(state); NewColor.y = (float)ShipUtils::RandomDouble(state);

3
soh/soh/SohGui/UIWidgets.hpp
View file

@ -1089,8 +1089,7 @@ void InsertHelpHoverText(const std::string& text);
void InsertHelpHoverText(const char* text); void InsertHelpHoverText(const char* text);
} // namespace UIWidgets } // namespace UIWidgets
ImVec4 GetRandomValue(); ImVec4 GetRandomValue(uint64_t* state = nullptr);
ImVec4 GetRandomValue(uint32_t seed, uint64_t* state = nullptr);
Color_RGBA8 RGBA8FromVec(ImVec4 vec); Color_RGBA8 RGBA8FromVec(ImVec4 vec);
ImVec4 VecFromRGBA8(Color_RGBA8 color); ImVec4 VecFromRGBA8(Color_RGBA8 color);