mirror of
https://github.com/Kelsidavis/WoWee.git
synced 2026-05-11 11:33:52 +00:00
feat(editor): add WSDR (Spell Duration Index) — completes WSRG/WSCT/WSDR triplet
Open replacement for SpellDuration.dbc plus per-spell duration fields in Spell.dbc. Defines the categorical duration buckets that auras / DoTs / HoTs / buffs reference (5s / 30s / 5min / 1hr / UntilCancelled / UntilDeath). Together with WSRG (range) and WSCT (cast time), this completes a small triplet of spell-metadata catalogs: instead of every Frostbolt rank embedding its own range, cast time, and chill-debuff duration as duplicate fields, each spell holds three small integer ids that resolve through these three tables. The engine retunes thousands of spells at once by editing one bucket. Duration scales with caster level via perLevelMs (a rank-1 Renew at 9s grows to 12s at lvl 60), then is clamped to maxDurationMs. Negative baseDurationMs is the canonical sentinel for "no timer" (UntilCancelled / UntilDeath); resolveAtLevel returns -1 for those so HUD code can render the indefinite-duration glyph. Three preset emitters: --gen-sdr (5 baseline tiers from instant to one-hour), --gen-sdr-buffs (4 long-duration buffs including UntilDeath), --gen-sdr-dot (4 tick-based DoT/HoT buckets at 3s ticks). Validation enforces base>0 for Timed/TickBased, base<0 for permanent kinds, max>=base, durationKind 0..4, no duplicate ids, and warns on Instant+nonzero base. Wired through the cross-format table; WSDR appears automatically in all 9 cross-format utilities. Format count 69 -> 70; CLI flag count 899 -> 904.
This commit is contained in:
Kelsi
parent
479e96a68a
commit
98f899cf7c
10 changed files with 653 additions and 0 deletions
255
tools/editor/cli_spell_durations_catalog.cpp
Normal file
255
tools/editor/cli_spell_durations_catalog.cpp
Normal file
|
|
@ -0,0 +1,255 @@
|
|||
#include "cli_spell_durations_catalog.hpp"
|
||||
#include "cli_arg_parse.hpp"
|
||||
#include "cli_box_emitter.hpp"
|
||||
|
||||
#include "pipeline/wowee_spell_durations.hpp"
|
||||
#include <nlohmann/json.hpp>
|
||||
|
||||
#include <cstdint>
|
||||
#include <cstdio>
|
||||
#include <cstring>
|
||||
#include <fstream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
namespace wowee {
|
||||
namespace editor {
|
||||
namespace cli {
|
||||
|
||||
namespace {
|
||||
|
||||
std::string stripWsdrExt(std::string base) {
|
||||
stripExt(base, ".wsdr");
|
||||
return base;
|
||||
}
|
||||
|
||||
bool saveOrError(const wowee::pipeline::WoweeSpellDuration& c,
|
||||
const std::string& base, const char* cmd) {
|
||||
if (!wowee::pipeline::WoweeSpellDurationLoader::save(c, base)) {
|
||||
std::fprintf(stderr, "%s: failed to save %s.wsdr\n",
|
||||
cmd, base.c_str());
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void printGenSummary(const wowee::pipeline::WoweeSpellDuration& c,
|
||||
const std::string& base) {
|
||||
std::printf("Wrote %s.wsdr\n", base.c_str());
|
||||
std::printf(" catalog : %s\n", c.name.c_str());
|
||||
std::printf(" buckets : %zu\n", c.entries.size());
|
||||
}
|
||||
|
||||
int handleGenStarter(int& i, int argc, char** argv) {
|
||||
std::string base = argv[++i];
|
||||
std::string name = "StarterDurations";
|
||||
if (parseOptArg(i, argc, argv)) name = argv[++i];
|
||||
base = stripWsdrExt(base);
|
||||
auto c = wowee::pipeline::WoweeSpellDurationLoader::makeStarter(name);
|
||||
if (!saveOrError(c, base, "gen-sdr")) return 1;
|
||||
printGenSummary(c, base);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int handleGenBuffs(int& i, int argc, char** argv) {
|
||||
std::string base = argv[++i];
|
||||
std::string name = "LongDurationBuffs";
|
||||
if (parseOptArg(i, argc, argv)) name = argv[++i];
|
||||
base = stripWsdrExt(base);
|
||||
auto c = wowee::pipeline::WoweeSpellDurationLoader::makeBuffs(name);
|
||||
if (!saveOrError(c, base, "gen-sdr-buffs")) return 1;
|
||||
printGenSummary(c, base);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int handleGenDot(int& i, int argc, char** argv) {
|
||||
std::string base = argv[++i];
|
||||
std::string name = "DoTHoTDurations";
|
||||
if (parseOptArg(i, argc, argv)) name = argv[++i];
|
||||
base = stripWsdrExt(base);
|
||||
auto c = wowee::pipeline::WoweeSpellDurationLoader::makeDot(name);
|
||||
if (!saveOrError(c, base, "gen-sdr-dot")) return 1;
|
||||
printGenSummary(c, base);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int handleInfo(int& i, int argc, char** argv) {
|
||||
std::string base = argv[++i];
|
||||
bool jsonOut = consumeJsonFlag(i, argc, argv);
|
||||
base = stripWsdrExt(base);
|
||||
if (!wowee::pipeline::WoweeSpellDurationLoader::exists(base)) {
|
||||
std::fprintf(stderr, "WSDR not found: %s.wsdr\n", base.c_str());
|
||||
return 1;
|
||||
}
|
||||
auto c = wowee::pipeline::WoweeSpellDurationLoader::load(base);
|
||||
if (jsonOut) {
|
||||
nlohmann::json j;
|
||||
j["wsdr"] = base + ".wsdr";
|
||||
j["name"] = c.name;
|
||||
j["count"] = c.entries.size();
|
||||
nlohmann::json arr = nlohmann::json::array();
|
||||
for (const auto& e : c.entries) {
|
||||
arr.push_back({
|
||||
{"durationId", e.durationId},
|
||||
{"name", e.name},
|
||||
{"description", e.description},
|
||||
{"durationKind", e.durationKind},
|
||||
{"durationKindName", wowee::pipeline::WoweeSpellDuration::durationKindName(e.durationKind)},
|
||||
{"baseDurationMs", e.baseDurationMs},
|
||||
{"perLevelMs", e.perLevelMs},
|
||||
{"maxDurationMs", e.maxDurationMs},
|
||||
{"iconColorRGBA", e.iconColorRGBA},
|
||||
});
|
||||
}
|
||||
j["entries"] = arr;
|
||||
std::printf("%s\n", j.dump(2).c_str());
|
||||
return 0;
|
||||
}
|
||||
std::printf("WSDR: %s.wsdr\n", base.c_str());
|
||||
std::printf(" catalog : %s\n", c.name.c_str());
|
||||
std::printf(" buckets : %zu\n", c.entries.size());
|
||||
if (c.entries.empty()) return 0;
|
||||
std::printf(" id kind baseMs perLvl maxMs color name\n");
|
||||
for (const auto& e : c.entries) {
|
||||
std::printf(" %4u %-15s %8d %8d %9d 0x%08x %s\n",
|
||||
e.durationId,
|
||||
wowee::pipeline::WoweeSpellDuration::durationKindName(e.durationKind),
|
||||
e.baseDurationMs, e.perLevelMs,
|
||||
e.maxDurationMs,
|
||||
e.iconColorRGBA, e.name.c_str());
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int handleValidate(int& i, int argc, char** argv) {
|
||||
std::string base = argv[++i];
|
||||
bool jsonOut = consumeJsonFlag(i, argc, argv);
|
||||
base = stripWsdrExt(base);
|
||||
if (!wowee::pipeline::WoweeSpellDurationLoader::exists(base)) {
|
||||
std::fprintf(stderr,
|
||||
"validate-wsdr: WSDR not found: %s.wsdr\n", base.c_str());
|
||||
return 1;
|
||||
}
|
||||
auto c = wowee::pipeline::WoweeSpellDurationLoader::load(base);
|
||||
std::vector<std::string> errors;
|
||||
std::vector<std::string> warnings;
|
||||
if (c.entries.empty()) {
|
||||
warnings.push_back("catalog has zero entries");
|
||||
}
|
||||
std::vector<uint32_t> idsSeen;
|
||||
for (size_t k = 0; k < c.entries.size(); ++k) {
|
||||
const auto& e = c.entries[k];
|
||||
std::string ctx = "entry " + std::to_string(k) +
|
||||
" (id=" + std::to_string(e.durationId);
|
||||
if (!e.name.empty()) ctx += " " + e.name;
|
||||
ctx += ")";
|
||||
if (e.durationId == 0)
|
||||
errors.push_back(ctx + ": durationId is 0");
|
||||
if (e.name.empty())
|
||||
errors.push_back(ctx + ": name is empty");
|
||||
if (e.durationKind > wowee::pipeline::WoweeSpellDuration::UntilDeath) {
|
||||
errors.push_back(ctx + ": durationKind " +
|
||||
std::to_string(e.durationKind) + " not in 0..4");
|
||||
}
|
||||
if (e.maxDurationMs < 0)
|
||||
errors.push_back(ctx + ": maxDurationMs < 0");
|
||||
if (e.perLevelMs < 0)
|
||||
warnings.push_back(ctx +
|
||||
": perLevelMs < 0 — duration shrinks with "
|
||||
"level, double-check this is intentional");
|
||||
// Instant kind should have base == 0.
|
||||
if (e.durationKind == wowee::pipeline::WoweeSpellDuration::Instant &&
|
||||
e.baseDurationMs != 0) {
|
||||
warnings.push_back(ctx +
|
||||
": Instant kind with baseDurationMs=" +
|
||||
std::to_string(e.baseDurationMs) +
|
||||
" — engine will track it as a timed aura");
|
||||
}
|
||||
// UntilCancelled / UntilDeath should signal "no
|
||||
// timer" via baseDurationMs<0; otherwise the engine
|
||||
// would tick down to expiry.
|
||||
if ((e.durationKind == wowee::pipeline::WoweeSpellDuration::UntilCancelled ||
|
||||
e.durationKind == wowee::pipeline::WoweeSpellDuration::UntilDeath) &&
|
||||
e.baseDurationMs >= 0) {
|
||||
warnings.push_back(ctx +
|
||||
": permanent kind with non-negative "
|
||||
"baseDurationMs — engine treats this as timed; "
|
||||
"set baseDurationMs=-1 to flag as no-timer");
|
||||
}
|
||||
// Timed/TickBased should have base > 0.
|
||||
if ((e.durationKind == wowee::pipeline::WoweeSpellDuration::Timed ||
|
||||
e.durationKind == wowee::pipeline::WoweeSpellDuration::TickBased) &&
|
||||
e.baseDurationMs <= 0) {
|
||||
errors.push_back(ctx +
|
||||
": Timed/TickBased kind requires "
|
||||
"baseDurationMs > 0");
|
||||
}
|
||||
// maxDurationMs<base is contradictory.
|
||||
if (e.maxDurationMs > 0 && e.baseDurationMs > e.maxDurationMs) {
|
||||
errors.push_back(ctx + ": baseDurationMs " +
|
||||
std::to_string(e.baseDurationMs) +
|
||||
" > maxDurationMs " +
|
||||
std::to_string(e.maxDurationMs));
|
||||
}
|
||||
for (uint32_t prev : idsSeen) {
|
||||
if (prev == e.durationId) {
|
||||
errors.push_back(ctx + ": duplicate durationId");
|
||||
break;
|
||||
}
|
||||
}
|
||||
idsSeen.push_back(e.durationId);
|
||||
}
|
||||
bool ok = errors.empty();
|
||||
if (jsonOut) {
|
||||
nlohmann::json j;
|
||||
j["wsdr"] = base + ".wsdr";
|
||||
j["ok"] = ok;
|
||||
j["errors"] = errors;
|
||||
j["warnings"] = warnings;
|
||||
std::printf("%s\n", j.dump(2).c_str());
|
||||
return ok ? 0 : 1;
|
||||
}
|
||||
std::printf("validate-wsdr: %s.wsdr\n", base.c_str());
|
||||
if (ok && warnings.empty()) {
|
||||
std::printf(" OK — %zu buckets, all durationIds unique\n",
|
||||
c.entries.size());
|
||||
return 0;
|
||||
}
|
||||
if (!warnings.empty()) {
|
||||
std::printf(" warnings (%zu):\n", warnings.size());
|
||||
for (const auto& w : warnings)
|
||||
std::printf(" - %s\n", w.c_str());
|
||||
}
|
||||
if (!errors.empty()) {
|
||||
std::printf(" ERRORS (%zu):\n", errors.size());
|
||||
for (const auto& e : errors)
|
||||
std::printf(" - %s\n", e.c_str());
|
||||
}
|
||||
return ok ? 0 : 1;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
bool handleSpellDurationsCatalog(int& i, int argc, char** argv,
|
||||
int& outRc) {
|
||||
if (std::strcmp(argv[i], "--gen-sdr") == 0 && i + 1 < argc) {
|
||||
outRc = handleGenStarter(i, argc, argv); return true;
|
||||
}
|
||||
if (std::strcmp(argv[i], "--gen-sdr-buffs") == 0 && i + 1 < argc) {
|
||||
outRc = handleGenBuffs(i, argc, argv); return true;
|
||||
}
|
||||
if (std::strcmp(argv[i], "--gen-sdr-dot") == 0 && i + 1 < argc) {
|
||||
outRc = handleGenDot(i, argc, argv); return true;
|
||||
}
|
||||
if (std::strcmp(argv[i], "--info-wsdr") == 0 && i + 1 < argc) {
|
||||
outRc = handleInfo(i, argc, argv); return true;
|
||||
}
|
||||
if (std::strcmp(argv[i], "--validate-wsdr") == 0 && i + 1 < argc) {
|
||||
outRc = handleValidate(i, argc, argv); return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
} // namespace cli
|
||||
} // namespace editor
|
||||
} // namespace wowee
|
||||
Loading…
Add table
Add a link
Reference in a new issue