phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-11 03:23:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat(editor): add WHRD JSON round-trip (--export/--import-whrd-json)

Browse source 
Novel pct/basis-points dual encoding for
bonusQualityChance: stored on disk as raw uint16 basis
points (0..10000) for compactness and integer-precision
math, but exported with both forms — bonusQualityChance
(int basis points, authoritative) and bonusQualityPct
(float, derived = bp / 100). Import accepts either form;
when only bonusQualityPct is present, converts pct *
100 to basis points with rounding.

This pattern is novel for the catalog set: most
percentage-style fields stored either as int (precise,
unfriendly) or as float (friendly, lossy round-trip).
The dual form gets both: byte-identical round-trip from
binary, AND human-friendly editing in JSON.

itemLevelDelta serializes as signed int16 (Heroic
modes can technically downgrade ilvl, though the
validator warns on negative). dropChanceMultiplier as
plain float.

All 3 presets (5man/raid25/challenge-mode) byte-
identical roundtrip OK. Pct-form import smoke-tested
with 7.5%% -> 750 basis points conversion. CLI flag
count 1182 -> 1184.
This commit is contained in:
Kelsi 2026-05-10 01:55:23 -07:00
parent 81b8572b50
commit f7ea99948a
3 changed files with 139 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tools/editor/cli_arg_required.cpp
View file

@ -333,6 +333,7 @@ const char* const kArgRequired[] = {
"--export-wptt-json", "--import-wptt-json",
"--gen-hrd", "--gen-hrd-raid25", "--gen-hrd-cm",
"--info-whrd", "--validate-whrd",
"--export-whrd-json", "--import-whrd-json",
"--gen-weather-temperate", "--gen-weather-arctic",
"--gen-weather-desert", "--gen-weather-stormy",
"--gen-zone-atmosphere",

4
tools/editor/cli_help.cpp
View file

@ -2275,6 +2275,10 @@ void printUsage(const char* argv0) {
std::printf(" Print WHRD entries (id / map / difficulty / +ilvl / bonus quality %% / drop multiplier / token id / extra emblems / name)\n");
std::printf(" --validate-whrd <whrd-base> [--json]\n");
std::printf(" Static checks: id+name required, difficultyId>0 (Normal=0 by convention), bonusQualityChance<=10000 basis points, dropChanceMultiplier>0, no duplicate scalingIds, no two scalings binding the same (mapId,difficultyId) tuple unless mapId=0 wildcard; warns on negative ilvlDelta (Heroic worse than Normal?), ilvl>50 (beyond canonical range), drop multiplier>10x\n");
std::printf(" --export-whrd-json <whrd-base> [out.json]\n");
std::printf(" Export binary .whrd to a human-editable JSON sidecar (defaults to <base>.whrd.json; emits bonusQualityChance as both raw basis points AND derived bonusQualityPct float convenience field)\n");
std::printf(" --import-whrd-json <json-path> [out-base]\n");
std::printf(" Import a .whrd.json sidecar back into binary .whrd (bonusQualityChance accepts raw basis points int OR bonusQualityPct float — converts pct *100 -> basis points; itemLevelDelta is signed int16; dropChanceMultiplier is float)\n");
std::printf(" --catalog-pluck <wXXX-file> <id> [--json]\n");
std::printf(" Extract one entry by id from any registered catalog format. Auto-detects magic, dispatches to the per-format --info-* handler internally, then prints just the matching entry. Primary-key field is auto-detected (first *Id field, or first numeric)\n");
std::printf(" --catalog-find <directory> <id> [--magic <WXXX>] [--json]\n");

134
tools/editor/cli_heroic_scaling_catalog.cpp
View file

@ -127,6 +127,134 @@ int handleInfo(int& i, int argc, char** argv) {
return 0;
}
int handleExportJson(int& i, int argc, char** argv) {
std::string base = argv[++i];
std::string out;
if (parseOptArg(i, argc, argv)) out = argv[++i];
base = stripWhrdExt(base);
if (out.empty()) out = base + ".whrd.json";
if (!wowee::pipeline::WoweeHeroicScalingLoader::exists(base)) {
std::fprintf(stderr,
"export-whrd-json: WHRD not found: %s.whrd\n",
base.c_str());
return 1;
}
auto c = wowee::pipeline::WoweeHeroicScalingLoader::load(base);
nlohmann::json j;
j["magic"] = "WHRD";
j["version"] = 1;
j["name"] = c.name;
nlohmann::json arr = nlohmann::json::array();
for (const auto& e : c.entries) {
arr.push_back({
{"scalingId", e.scalingId},
{"name", e.name},
{"description", e.description},
{"mapId", e.mapId},
{"difficultyId", e.difficultyId},
{"itemLevelDelta", e.itemLevelDelta},
{"bonusQualityChance", e.bonusQualityChance},
{"bonusQualityPct",
e.bonusQualityChance / 100.0},
{"dropChanceMultiplier", e.dropChanceMultiplier},
{"heroicTokenItemId", e.heroicTokenItemId},
{"bonusEmblemCount", e.bonusEmblemCount},
{"iconColorRGBA", e.iconColorRGBA},
});
}
j["entries"] = arr;
std::ofstream os(out);
if (!os) {
std::fprintf(stderr,
"export-whrd-json: failed to open %s for write\n",
out.c_str());
return 1;
}
os << j.dump(2) << "\n";
std::printf("Wrote %s (%zu scalings)\n",
out.c_str(), c.entries.size());
return 0;
}
int handleImportJson(int& i, int argc, char** argv) {
std::string in = argv[++i];
std::string outBase;
if (parseOptArg(i, argc, argv)) outBase = argv[++i];
if (outBase.empty()) {
outBase = in;
if (outBase.size() >= 10 &&
outBase.substr(outBase.size() - 10) == ".whrd.json") {
outBase.resize(outBase.size() - 10);
} else {
stripExt(outBase, ".json");
stripExt(outBase, ".whrd");
}
}
std::ifstream is(in);
if (!is) {
std::fprintf(stderr,
"import-whrd-json: cannot open %s\n", in.c_str());
return 1;
}
nlohmann::json j;
try {
is >> j;
} catch (const std::exception& ex) {
std::fprintf(stderr,
"import-whrd-json: JSON parse error: %s\n", ex.what());
return 1;
}
wowee::pipeline::WoweeHeroicScaling c;
c.name = j.value("name", std::string{});
if (!j.contains("entries") || !j["entries"].is_array()) {
std::fprintf(stderr,
"import-whrd-json: missing or non-array 'entries'\n");
return 1;
}
for (const auto& je : j["entries"]) {
wowee::pipeline::WoweeHeroicScaling::Entry e;
e.scalingId = je.value("scalingId", 0u);
e.name = je.value("name", std::string{});
e.description = je.value("description", std::string{});
e.mapId = je.value("mapId", 0u);
e.difficultyId = je.value("difficultyId", 0u);
e.itemLevelDelta = static_cast<int16_t>(
je.value("itemLevelDelta", 0));
// bonusQualityChance: accept the basis-points int
// form (preferred) OR the bonusQualityPct float
// form (convenience for hand-edited JSON).
if (je.contains("bonusQualityChance") &&
je["bonusQualityChance"].is_number_integer()) {
e.bonusQualityChance = static_cast<uint16_t>(
je["bonusQualityChance"].get<int>());
} else if (je.contains("bonusQualityPct") &&
je["bonusQualityPct"].is_number()) {
// pct → basis points (× 100, rounded)
double pct = je["bonusQualityPct"].get<double>();
int bp = static_cast<int>(pct * 100.0 + 0.5);
if (bp < 0) bp = 0;
if (bp > 65535) bp = 65535;
e.bonusQualityChance = static_cast<uint16_t>(bp);
}
e.dropChanceMultiplier = je.value(
"dropChanceMultiplier", 1.0f);
e.heroicTokenItemId = je.value("heroicTokenItemId", 0u);
e.bonusEmblemCount = static_cast<uint8_t>(
je.value("bonusEmblemCount", 0u));
e.iconColorRGBA = je.value("iconColorRGBA", 0xFFFFFFFFu);
c.entries.push_back(e);
}
if (!wowee::pipeline::WoweeHeroicScalingLoader::save(c, outBase)) {
std::fprintf(stderr,
"import-whrd-json: failed to save %s.whrd\n",
outBase.c_str());
return 1;
}
std::printf("Wrote %s.whrd (%zu scalings)\n",
outBase.c_str(), c.entries.size());
return 0;
}
int handleValidate(int& i, int argc, char** argv) {
std::string base = argv[++i];
bool jsonOut = consumeJsonFlag(i, argc, argv);
@ -272,6 +400,12 @@ bool handleHeroicScalingCatalog(int& i, int argc, char** argv,
if (std::strcmp(argv[i], "--validate-whrd") == 0 && i + 1 < argc) {
outRc = handleValidate(i, argc, argv); return true;
}
if (std::strcmp(argv[i], "--export-whrd-json") == 0 && i + 1 < argc) {
outRc = handleExportJson(i, argc, argv); return true;
}
if (std::strcmp(argv[i], "--import-whrd-json") == 0 && i + 1 < argc) {
outRc = handleImportJson(i, argc, argv); return true;
}
return false;
}