mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-18 06:12:20 -05:00
Code Issues Projects Releases Wiki Activity

Properly check for pre-existing gInjectItemCounts before setting the new separate CVars. (#4692)

Browse Source
This commit is contained in:
Malkierian 2024-12-15 15:20:51 -07:00 committed by GitHub
parent 0f167d119b
commit add5347126
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
soh/soh/config/ConfigUpdaters.cpp
View File

@ -71,17 +71,17 @@ namespace SOH {
void ConfigVersion3Updater::Update(Ship::Config* conf) { void ConfigVersion3Updater::Update(Ship::Config* conf) {
conf->EraseBlock("Controllers"); conf->EraseBlock("Controllers");
if (conf->GetNestedJson().contains("CVars") && conf->GetNestedJson()["CVars"].contains("gInjectItemCounts")) {
CVarClear("gInjectItemCounts");
CVarSetInteger("gEnhancements.InjectItemCounts.GoldSkulltula", 1);
CVarSetInteger("gEnhancements.InjectItemCounts.HeartContainer", 1);
CVarSetInteger("gEnhancements.InjectItemCounts.HeartPiece", 1);
}
for (Migration migration : version3Migrations) { for (Migration migration : version3Migrations) {
if (migration.action == MigrationAction::Rename) { if (migration.action == MigrationAction::Rename) {
CVarCopy(migration.from.c_str(), migration.to.value().c_str()); CVarCopy(migration.from.c_str(), migration.to.value().c_str());
} }
CVarClear(migration.from.c_str()); CVarClear(migration.from.c_str());
} }
if (conf->Contains("CVars.gEnhancements.InjectItemCounts")) {
CVarClear("gEnhancements.InjectItemCounts");
CVarSetInteger("gEnhancements.InjectItemCounts.GoldSkulltula", 1);
CVarSetInteger("gEnhancements.InjectItemCounts.HeartContainer", 1);
CVarSetInteger("gEnhancements.InjectItemCounts.HeartPiece", 1);
}
} }
} }