nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add merge strategy for preset sections (#5935)

Browse Source
This commit is contained in:
Garrett Cox
2025-11-08 15:50:41 -06:00
committed by GitHub
parent 43118146e4
commit 66a9c7a218
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
soh/soh/Enhancements/Presets/Presets.cpp
View File

@@ -61,7 +61,9 @@ void PresetCheckboxStyle(const ImVec4& color) {
} }
static BlockInfo blockInfo[PRESET_SECTION_MAX] = { static BlockInfo blockInfo[PRESET_SECTION_MAX] = {
{ { CVAR_PREFIX_SETTING, CVAR_PREFIX_WINDOW }, ICON_FA_COG, { "Settings", "settings" } }, { { CVAR_PREFIX_SETTING, CVAR_PREFIX_WINDOW, CVAR_PREFIX_GAMEPLAY_STATS },
ICON_FA_COG,
{ "Settings", "settings" } },
{ { CVAR_PREFIX_ENHANCEMENT, CVAR_PREFIX_RANDOMIZER_ENHANCEMENT, CVAR_PREFIX_CHEAT }, { { CVAR_PREFIX_ENHANCEMENT, CVAR_PREFIX_RANDOMIZER_ENHANCEMENT, CVAR_PREFIX_CHEAT },
ICON_FA_PLUS_CIRCLE, ICON_FA_PLUS_CIRCLE,
{ "Enhancements", "enhancements" } }, { "Enhancements", "enhancements" } },
@@ -96,12 +98,28 @@ void applyPreset(std::string presetName, std::vector<PresetSection> includeSecti
} }
} }
auto section = info.presetValues["blocks"][blockInfo[i].names[1]]; auto section = info.presetValues["blocks"][blockInfo[i].names[1]];
std::string sectionStrategy = "overwrite";
if (info.presetValues.contains("blockStrategy") &&
info.presetValues["blockStrategy"].contains(blockInfo[i].names[1])) {
sectionStrategy = info.presetValues["blockStrategy"][blockInfo[i].names[1]];
}
for (auto& item : section.items()) { for (auto& item : section.items()) {
if (section[item.key()].is_null()) { if (section[item.key()].is_null()) {
CVarClearBlock(item.key().c_str()); CVarClearBlock(item.key().c_str());
} else { } else {
auto block = item.value();
if (sectionStrategy == "merge") {
auto currentJson = Ship::Context::GetInstance()->GetConfig()->GetNestedJson();
if (currentJson.contains("CVars") && currentJson["CVars"].contains(item.key())) {
block = currentJson["CVars"][item.key()];
// Recursively merge the two json objects
block.update(item.value(), true);
}
}
Ship::Context::GetInstance()->GetConfig()->SetBlock(fmt::format("{}.{}", "CVars", item.key()), Ship::Context::GetInstance()->GetConfig()->SetBlock(fmt::format("{}.{}", "CVars", item.key()),
item.value()); block);
Ship::Context::GetInstance()->GetConsoleVariables()->Load(); Ship::Context::GetInstance()->GetConsoleVariables()->Load();
} }
} }