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 WCRR JSON round-trip (export/import sidecar)

Browse source 
Closes the JSON round-trip gap on the combat rating
conversion catalog format shipped last batch.
--export-wcrr-json emits all 10 scalar fields plus a dual
int + name form for ratingKind so hand-edits can use
either representation. --import-wcrr-json defaults
pointsAtL1/L60/L70/L80 to canonical WoW WotLK starter
values when omitted (1 / 14 / 22 / 45) — matches typical
combat rating curves so a sparse sidecar still produces a
working catalog. Verified byte-identical round-trip on all
three preset emitters (starter Hit/Crit/Haste / defensive
Defense+Dodge+Parry+Block / spell SpellPower+Pen+MP5).
870 documented CLI flags.
This commit is contained in:
Kelsi 2026-05-09 21:14:18 -07:00
parent 5865421b00
commit 626d9e09fa
3 changed files with 132 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

@ -199,6 +199,7 @@ const char* const kArgRequired[] = {
"--export-wsuf-json", "--import-wsuf-json",
"--gen-crr", "--gen-crr-defensive", "--gen-crr-spell",
"--info-wcrr", "--validate-wcrr",
"--export-wcrr-json", "--import-wcrr-json",
"--gen-weather-temperate", "--gen-weather-arctic",
"--gen-weather-desert", "--gen-weather-stormy",
"--gen-zone-atmosphere",

127
tools/editor/cli_combat_ratings_catalog.cpp
View file

@ -124,6 +124,127 @@ 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 outPath;
if (parseOptArg(i, argc, argv)) outPath = argv[++i];
base = stripWcrrExt(base);
if (outPath.empty()) outPath = base + ".wcrr.json";
if (!wowee::pipeline::WoweeCombatRatingLoader::exists(base)) {
std::fprintf(stderr,
"export-wcrr-json: WCRR not found: %s.wcrr\n", base.c_str());
return 1;
}
auto c = wowee::pipeline::WoweeCombatRatingLoader::load(base);
nlohmann::json j;
j["name"] = c.name;
nlohmann::json arr = nlohmann::json::array();
for (const auto& e : c.entries) {
arr.push_back({
{"ratingType", e.ratingType},
{"name", e.name},
{"description", e.description},
{"iconPath", e.iconPath},
{"ratingKind", e.ratingKind},
{"ratingKindName", wowee::pipeline::WoweeCombatRating::ratingKindName(e.ratingKind)},
{"pointsAtL1", e.pointsAtL1},
{"pointsAtL60", e.pointsAtL60},
{"pointsAtL70", e.pointsAtL70},
{"pointsAtL80", e.pointsAtL80},
{"maxBenefitPercent", e.maxBenefitPercent},
});
}
j["entries"] = arr;
std::ofstream out(outPath);
if (!out) {
std::fprintf(stderr,
"export-wcrr-json: cannot write %s\n", outPath.c_str());
return 1;
}
out << j.dump(2) << "\n";
out.close();
std::printf("Wrote %s\n", outPath.c_str());
std::printf(" source : %s.wcrr\n", base.c_str());
std::printf(" ratings : %zu\n", c.entries.size());
return 0;
}
int handleImportJson(int& i, int argc, char** argv) {
std::string jsonPath = argv[++i];
std::string outBase;
if (parseOptArg(i, argc, argv)) outBase = argv[++i];
if (outBase.empty()) {
outBase = jsonPath;
std::string suffix = ".wcrr.json";
if (outBase.size() > suffix.size() &&
outBase.substr(outBase.size() - suffix.size()) == suffix) {
outBase = outBase.substr(0, outBase.size() - suffix.size());
} else if (outBase.size() > 5 &&
outBase.substr(outBase.size() - 5) == ".json") {
outBase = outBase.substr(0, outBase.size() - 5);
}
}
outBase = stripWcrrExt(outBase);
std::ifstream in(jsonPath);
if (!in) {
std::fprintf(stderr,
"import-wcrr-json: cannot read %s\n", jsonPath.c_str());
return 1;
}
nlohmann::json j;
try { in >> j; }
catch (const std::exception& e) {
std::fprintf(stderr,
"import-wcrr-json: bad JSON in %s: %s\n",
jsonPath.c_str(), e.what());
return 1;
}
auto kindFromName = [](const std::string& s) -> uint8_t {
if (s == "combat") return wowee::pipeline::WoweeCombatRating::Combat;
if (s == "defense") return wowee::pipeline::WoweeCombatRating::Defense;
if (s == "spell") return wowee::pipeline::WoweeCombatRating::Spell;
if (s == "resilience") return wowee::pipeline::WoweeCombatRating::Resilience;
if (s == "other") return wowee::pipeline::WoweeCombatRating::Other;
return wowee::pipeline::WoweeCombatRating::Combat;
};
wowee::pipeline::WoweeCombatRating c;
c.name = j.value("name", std::string{});
if (j.contains("entries") && j["entries"].is_array()) {
for (const auto& je : j["entries"]) {
wowee::pipeline::WoweeCombatRating::Entry e;
e.ratingType = je.value("ratingType", 0u);
e.name = je.value("name", std::string{});
e.description = je.value("description", std::string{});
e.iconPath = je.value("iconPath", std::string{});
if (je.contains("ratingKind") &&
je["ratingKind"].is_number_integer()) {
e.ratingKind = static_cast<uint8_t>(
je["ratingKind"].get<int>());
} else if (je.contains("ratingKindName") &&
je["ratingKindName"].is_string()) {
e.ratingKind = kindFromName(
je["ratingKindName"].get<std::string>());
}
e.pointsAtL1 = je.value("pointsAtL1", 1.0f);
e.pointsAtL60 = je.value("pointsAtL60", 14.0f);
e.pointsAtL70 = je.value("pointsAtL70", 22.0f);
e.pointsAtL80 = je.value("pointsAtL80", 45.0f);
e.maxBenefitPercent = je.value("maxBenefitPercent",
100.0f);
c.entries.push_back(e);
}
}
if (!wowee::pipeline::WoweeCombatRatingLoader::save(c, outBase)) {
std::fprintf(stderr,
"import-wcrr-json: failed to save %s.wcrr\n", outBase.c_str());
return 1;
}
std::printf("Wrote %s.wcrr\n", outBase.c_str());
std::printf(" source : %s\n", jsonPath.c_str());
std::printf(" ratings : %zu\n", c.entries.size());
return 0;
}
int handleValidate(int& i, int argc, char** argv) {
std::string base = argv[++i];
bool jsonOut = consumeJsonFlag(i, argc, argv);
@ -244,6 +365,12 @@ bool handleCombatRatingsCatalog(int& i, int argc, char** argv,
if (std::strcmp(argv[i], "--validate-wcrr") == 0 && i + 1 < argc) {
outRc = handleValidate(i, argc, argv); return true;
}
if (std::strcmp(argv[i], "--export-wcrr-json") == 0 && i + 1 < argc) {
outRc = handleExportJson(i, argc, argv); return true;
}
if (std::strcmp(argv[i], "--import-wcrr-json") == 0 && i + 1 < argc) {
outRc = handleImportJson(i, argc, argv); return true;
}
return false;
}

4
tools/editor/cli_help.cpp
View file

@ -1653,6 +1653,10 @@ void printUsage(const char* argv0) {
std::printf(" Print WCRR entries (id / kind / pointsAtL1/L60/L70/L80 conversion floors / max benefit pct / name)\n");
std::printf(" --validate-wcrr <wcrr-base> [--json]\n");
std::printf(" Static checks: id+name required, kind 0..4, all pointsAtLN > 0 (div-by-zero risk), maxPct > 0, monotonic ascending curve\n");
std::printf(" --export-wcrr-json <wcrr-base> [out.json]\n");
std::printf(" Export binary .wcrr to a human-editable JSON sidecar (defaults to <base>.wcrr.json)\n");
std::printf(" --import-wcrr-json <json-path> [out-base]\n");
std::printf(" Import a .wcrr.json sidecar back into binary .wcrr (accepts ratingKind int OR name string; pointsAtLN default to canonical WoW values)\n");
std::printf(" --gen-weather-temperate <wow-base> [zoneName]\n");
std::printf(" Emit .wow weather schedule: clear-dominant + occasional rain + fog (forest / grassland)\n");
std::printf(" --gen-weather-arctic <wow-base> [zoneName]\n");