diff --git a/tools/editor/cli_arg_required.cpp b/tools/editor/cli_arg_required.cpp index b34caf53..c82270ec 100644 --- a/tools/editor/cli_arg_required.cpp +++ b/tools/editor/cli_arg_required.cpp @@ -91,6 +91,7 @@ const char* const kArgRequired[] = { "--export-wtit-json", "--import-wtit-json", "--gen-events", "--gen-events-yearly", "--gen-events-weekends", "--info-wsea", "--validate-wsea", + "--export-wsea-json", "--import-wsea-json", "--gen-mounts", "--gen-mounts-racial", "--gen-mounts-flying", "--info-wmou", "--validate-wmou", "--gen-weather-temperate", "--gen-weather-arctic", diff --git a/tools/editor/cli_events_catalog.cpp b/tools/editor/cli_events_catalog.cpp index 52cbff1d..15a8b374 100644 --- a/tools/editor/cli_events_catalog.cpp +++ b/tools/editor/cli_events_catalog.cpp @@ -128,6 +128,147 @@ int handleInfo(int& i, int argc, char** argv) { return 0; } +int handleExportJson(int& i, int argc, char** argv) { + // Mirrors the JSON pairs added for every other novel + // open format. Each event emits all 11 scalar fields + // plus dual int + name forms for holidayKind and + // factionGroup. + std::string base = argv[++i]; + std::string outPath; + if (parseOptArg(i, argc, argv)) outPath = argv[++i]; + base = stripWseaExt(base); + if (outPath.empty()) outPath = base + ".wsea.json"; + if (!wowee::pipeline::WoweeEventLoader::exists(base)) { + std::fprintf(stderr, + "export-wsea-json: WSEA not found: %s.wsea\n", base.c_str()); + return 1; + } + auto c = wowee::pipeline::WoweeEventLoader::load(base); + nlohmann::json j; + j["name"] = c.name; + nlohmann::json arr = nlohmann::json::array(); + for (const auto& e : c.entries) { + arr.push_back({ + {"eventId", e.eventId}, + {"name", e.name}, + {"description", e.description}, + {"iconPath", e.iconPath}, + {"announceMessage", e.announceMessage}, + {"startDate", e.startDate}, + {"duration_seconds", e.duration_seconds}, + {"recurrenceDays", e.recurrenceDays}, + {"holidayKind", e.holidayKind}, + {"holidayKindName", wowee::pipeline::WoweeEvent::holidayKindName(e.holidayKind)}, + {"factionGroup", e.factionGroup}, + {"factionGroupName", wowee::pipeline::WoweeEvent::factionGroupName(e.factionGroup)}, + {"bonusXpPercent", e.bonusXpPercent}, + {"tokenIdReward", e.tokenIdReward}, + }); + } + j["entries"] = arr; + std::ofstream out(outPath); + if (!out) { + std::fprintf(stderr, + "export-wsea-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.wsea\n", base.c_str()); + std::printf(" events : %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 = ".wsea.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 = stripWseaExt(outBase); + std::ifstream in(jsonPath); + if (!in) { + std::fprintf(stderr, + "import-wsea-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-wsea-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::WoweeEvent::Combat; + if (s == "collection") return wowee::pipeline::WoweeEvent::Collection; + if (s == "racial") return wowee::pipeline::WoweeEvent::Racial; + if (s == "anniversary") return wowee::pipeline::WoweeEvent::Anniversary; + if (s == "fishing") return wowee::pipeline::WoweeEvent::Fishing; + if (s == "cosmetic") return wowee::pipeline::WoweeEvent::Cosmetic; + if (s == "world-event") return wowee::pipeline::WoweeEvent::WorldEvent; + return wowee::pipeline::WoweeEvent::Combat; + }; + auto factionFromName = [](const std::string& s) -> uint8_t { + if (s == "both") return wowee::pipeline::WoweeEvent::FactionBoth; + if (s == "alliance") return wowee::pipeline::WoweeEvent::FactionAlliance; + if (s == "horde") return wowee::pipeline::WoweeEvent::FactionHorde; + return wowee::pipeline::WoweeEvent::FactionBoth; + }; + wowee::pipeline::WoweeEvent c; + c.name = j.value("name", std::string{}); + if (j.contains("entries") && j["entries"].is_array()) { + for (const auto& je : j["entries"]) { + wowee::pipeline::WoweeEvent::Entry e; + e.eventId = je.value("eventId", 0u); + e.name = je.value("name", std::string{}); + e.description = je.value("description", std::string{}); + e.iconPath = je.value("iconPath", std::string{}); + e.announceMessage = je.value("announceMessage", std::string{}); + e.startDate = je.value("startDate", static_cast(0)); + e.duration_seconds = je.value("duration_seconds", 0u); + e.recurrenceDays = static_cast( + je.value("recurrenceDays", 0)); + if (je.contains("holidayKind") && je["holidayKind"].is_number_integer()) { + e.holidayKind = static_cast(je["holidayKind"].get()); + } else if (je.contains("holidayKindName") && + je["holidayKindName"].is_string()) { + e.holidayKind = kindFromName(je["holidayKindName"].get()); + } + if (je.contains("factionGroup") && je["factionGroup"].is_number_integer()) { + e.factionGroup = static_cast(je["factionGroup"].get()); + } else if (je.contains("factionGroupName") && + je["factionGroupName"].is_string()) { + e.factionGroup = factionFromName(je["factionGroupName"].get()); + } + e.bonusXpPercent = static_cast( + je.value("bonusXpPercent", 0)); + e.tokenIdReward = je.value("tokenIdReward", 0u); + c.entries.push_back(std::move(e)); + } + } + if (!wowee::pipeline::WoweeEventLoader::save(c, outBase)) { + std::fprintf(stderr, + "import-wsea-json: failed to save %s.wsea\n", outBase.c_str()); + return 1; + } + std::printf("Wrote %s.wsea\n", outBase.c_str()); + std::printf(" source : %s\n", jsonPath.c_str()); + std::printf(" events : %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); @@ -227,6 +368,12 @@ bool handleEventsCatalog(int& i, int argc, char** argv, int& outRc) { if (std::strcmp(argv[i], "--validate-wsea") == 0 && i + 1 < argc) { outRc = handleValidate(i, argc, argv); return true; } + if (std::strcmp(argv[i], "--export-wsea-json") == 0 && i + 1 < argc) { + outRc = handleExportJson(i, argc, argv); return true; + } + if (std::strcmp(argv[i], "--import-wsea-json") == 0 && i + 1 < argc) { + outRc = handleImportJson(i, argc, argv); return true; + } return false; } diff --git a/tools/editor/cli_help.cpp b/tools/editor/cli_help.cpp index a49359f6..2a72bdd7 100644 --- a/tools/editor/cli_help.cpp +++ b/tools/editor/cli_help.cpp @@ -1147,6 +1147,10 @@ void printUsage(const char* argv0) { std::printf(" Print WSEA entries (id / kind / duration / recurrence / xp bonus / token reward / name)\n"); std::printf(" --validate-wsea [--json]\n"); std::printf(" Static checks: id>0+unique, name not empty, kind in 0..6, duration>0, no overlapping recurrence\n"); + std::printf(" --export-wsea-json [out.json]\n"); + std::printf(" Export binary .wsea to a human-editable JSON sidecar (defaults to .wsea.json)\n"); + std::printf(" --import-wsea-json [out-base]\n"); + std::printf(" Import a .wsea.json sidecar back into binary .wsea (accepts kind/faction int OR name forms)\n"); std::printf(" --gen-mounts [name]\n"); std::printf(" Emit .wmou starter: 3 mounts (Brown Horse / Swift Gryphon / Riding Turtle) covering ground/flying/aquatic\n"); std::printf(" --gen-mounts-racial [name]\n");