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 WACT (Action Bar Layout) open catalog format

Browse source 
Open replacement for the hardcoded per-class default action bar
bindings. Defines which abilities auto-populate which action
button slots when a new character is created or a class is
reset. A Warrior's button 1 binds Heroic Strike, button 2
Charge, button 3 Rend, etc. — new characters of that class get
those buttons pre-populated so the action bar isn't empty on
first login.

Distinct from WKBD (Keybindings) which maps physical keys to
action button slots — WACT maps action button slots to
abilities. The two together complete the default-control
configuration: Key 1 -> Action Slot 1 (WKBD) -> Heroic Strike
(WACT).

Seven barMode values cover the major action bar contexts:
  - Main (slots 0-11, standard 12-button bar)
  - Pet (hunter/warlock pet action bar)
  - Vehicle (mounted/vehicle action bar)
  - Stance1/2/3 (warrior battle/defensive/berserker; druid
    bear/cat/tree)
  - Custom (server-custom bar overlay)

Cross-references back to WCHC (classMask layout), WSPL (spellId
for the bound ability), and WIT (itemId for item-macro bindings
like Hearthstone in slot 12). findByClass(classBit, barMode)
returns the bindings sorted by buttonSlot — used directly by
character creation to populate action bars.

Three preset emitters: --gen-act (10 Warrior starter bindings on
Main bar with canonical 3.3.5a abilities), --gen-act-mage (10
Mage starter bindings including Counterspell + Polymorph),
--gen-act-pet (10 Hunter pet-bar bindings using barMode=Pet for
Attack/Stance/Bite/Claw/Dismiss).

Validation enforces id+name+classMask presence, barMode 0..6,
no duplicate ids; warns on:
  - buttonSlot > 143 (max is 12 bars × 12 slots = 144)
  - both spellId and itemId set (engine prefers spellId, item
    is silently ignored)
  - both spellId=0 AND itemId=0 (button will render empty)
  - (classMask + barMode + buttonSlot) collisions for
    overlapping classes — multiple bindings fighting for the
    same physical slot

Wired through the cross-format table; WACT appears in all 18
cross-format utilities. Format count 94 -> 95; CLI flag count
1083 -> 1088.
This commit is contained in:
Kelsi 2026-05-10 00:11:53 -07:00
parent 48ca202716
commit 48dbf72f11
10 changed files with 692 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

254
tools/editor/cli_action_bars_catalog.cpp Normal file
View file

@ -0,0 +1,254 @@
#include "cli_action_bars_catalog.hpp"
#include "cli_arg_parse.hpp"
#include "cli_box_emitter.hpp"
#include "pipeline/wowee_action_bars.hpp"
#include <nlohmann/json.hpp>
#include <cctype>
#include <cstdint>
#include <cstdio>
#include <cstring>
#include <fstream>
#include <string>
#include <vector>
namespace wowee {
namespace editor {
namespace cli {
namespace {
std::string stripWactExt(std::string base) {
stripExt(base, ".wact");
return base;
}
bool saveOrError(const wowee::pipeline::WoweeActionBar& c,
const std::string& base, const char* cmd) {
if (!wowee::pipeline::WoweeActionBarLoader::save(c, base)) {
std::fprintf(stderr, "%s: failed to save %s.wact\n",
cmd, base.c_str());
return false;
}
return true;
}
void printGenSummary(const wowee::pipeline::WoweeActionBar& c,
const std::string& base) {
std::printf("Wrote %s.wact\n", base.c_str());
std::printf(" catalog : %s\n", c.name.c_str());
std::printf(" bindings : %zu\n", c.entries.size());
}
int handleGenWarrior(int& i, int argc, char** argv) {
std::string base = argv[++i];
std::string name = "WarriorActionBar";
if (parseOptArg(i, argc, argv)) name = argv[++i];
base = stripWactExt(base);
auto c = wowee::pipeline::WoweeActionBarLoader::makeWarrior(name);
if (!saveOrError(c, base, "gen-act")) return 1;
printGenSummary(c, base);
return 0;
}
int handleGenMage(int& i, int argc, char** argv) {
std::string base = argv[++i];
std::string name = "MageActionBar";
if (parseOptArg(i, argc, argv)) name = argv[++i];
base = stripWactExt(base);
auto c = wowee::pipeline::WoweeActionBarLoader::makeMage(name);
if (!saveOrError(c, base, "gen-act-mage")) return 1;
printGenSummary(c, base);
return 0;
}
int handleGenHunterPet(int& i, int argc, char** argv) {
std::string base = argv[++i];
std::string name = "HunterPetBar";
if (parseOptArg(i, argc, argv)) name = argv[++i];
base = stripWactExt(base);
auto c = wowee::pipeline::WoweeActionBarLoader::makeHunterPet(name);
if (!saveOrError(c, base, "gen-act-pet")) 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 = stripWactExt(base);
if (!wowee::pipeline::WoweeActionBarLoader::exists(base)) {
std::fprintf(stderr, "WACT not found: %s.wact\n", base.c_str());
return 1;
}
auto c = wowee::pipeline::WoweeActionBarLoader::load(base);
if (jsonOut) {
nlohmann::json j;
j["wact"] = base + ".wact";
j["name"] = c.name;
j["count"] = c.entries.size();
nlohmann::json arr = nlohmann::json::array();
for (const auto& e : c.entries) {
arr.push_back({
{"bindingId", e.bindingId},
{"name", e.name},
{"description", e.description},
{"classMask", e.classMask},
{"spellId", e.spellId},
{"itemId", e.itemId},
{"buttonSlot", e.buttonSlot},
{"barMode", e.barMode},
{"barModeName", wowee::pipeline::WoweeActionBar::barModeName(e.barMode)},
{"iconColorRGBA", e.iconColorRGBA},
});
}
j["entries"] = arr;
std::printf("%s\n", j.dump(2).c_str());
return 0;
}
std::printf("WACT: %s.wact\n", base.c_str());
std::printf(" catalog : %s\n", c.name.c_str());
std::printf(" bindings : %zu\n", c.entries.size());
if (c.entries.empty()) return 0;
std::printf(" id classMask bar slot spellId itemId name\n");
for (const auto& e : c.entries) {
std::printf(" %4u 0x%08x %-8s %3u %5u %5u %s\n",
e.bindingId, e.classMask,
wowee::pipeline::WoweeActionBar::barModeName(e.barMode),
e.buttonSlot, e.spellId, e.itemId,
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 = stripWactExt(base);
if (!wowee::pipeline::WoweeActionBarLoader::exists(base)) {
std::fprintf(stderr,
"validate-wact: WACT not found: %s.wact\n", base.c_str());
return 1;
}
auto c = wowee::pipeline::WoweeActionBarLoader::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.bindingId);
if (!e.name.empty()) ctx += " " + e.name;
ctx += ")";
if (e.bindingId == 0)
errors.push_back(ctx + ": bindingId is 0");
if (e.name.empty())
errors.push_back(ctx + ": name is empty");
if (e.classMask == 0)
errors.push_back(ctx +
": classMask is 0 — no class can use this binding");
if (e.barMode > wowee::pipeline::WoweeActionBar::Custom) {
errors.push_back(ctx + ": barMode " +
std::to_string(e.barMode) + " not in 0..6");
}
if (e.buttonSlot > 143) {
warnings.push_back(ctx +
": buttonSlot " + std::to_string(e.buttonSlot) +
" > 143 (12 bars × 12 slots = 144 max)");
}
// Both spellId and itemId set is contradictory.
if (e.spellId != 0 && e.itemId != 0) {
warnings.push_back(ctx +
": both spellId and itemId set — engine prefers "
"spellId; itemId is ignored");
}
// Neither set means an empty button.
if (e.spellId == 0 && e.itemId == 0) {
warnings.push_back(ctx +
": both spellId=0 and itemId=0 — button will be empty");
}
for (uint32_t prev : idsSeen) {
if (prev == e.bindingId) {
errors.push_back(ctx + ": duplicate bindingId");
break;
}
}
idsSeen.push_back(e.bindingId);
}
// Cross-entry: detect (classMask, barMode, buttonSlot)
// collisions where overlapping classes would fight for
// the same physical slot.
for (size_t a = 0; a < c.entries.size(); ++a) {
for (size_t b = a + 1; b < c.entries.size(); ++b) {
const auto& ea = c.entries[a];
const auto& eb = c.entries[b];
if (ea.barMode != eb.barMode) continue;
if (ea.buttonSlot != eb.buttonSlot) continue;
if ((ea.classMask & eb.classMask) == 0) continue;
warnings.push_back(
"entries " + std::to_string(a) + " (" +
ea.name + ") and " + std::to_string(b) + " (" +
eb.name + ") share " +
wowee::pipeline::WoweeActionBar::barModeName(ea.barMode) +
" bar slot " + std::to_string(ea.buttonSlot) +
" for overlapping classMask — slot collision");
}
}
bool ok = errors.empty();
if (jsonOut) {
nlohmann::json j;
j["wact"] = base + ".wact";
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-wact: %s.wact\n", base.c_str());
if (ok && warnings.empty()) {
std::printf(" OK — %zu bindings, all bindingIds unique, no slot collisions\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 handleActionBarsCatalog(int& i, int argc, char** argv,
int& outRc) {
if (std::strcmp(argv[i], "--gen-act") == 0 && i + 1 < argc) {
outRc = handleGenWarrior(i, argc, argv); return true;
}
if (std::strcmp(argv[i], "--gen-act-mage") == 0 && i + 1 < argc) {
outRc = handleGenMage(i, argc, argv); return true;
}
if (std::strcmp(argv[i], "--gen-act-pet") == 0 && i + 1 < argc) {
outRc = handleGenHunterPet(i, argc, argv); return true;
}
if (std::strcmp(argv[i], "--info-wact") == 0 && i + 1 < argc) {
outRc = handleInfo(i, argc, argv); return true;
}
if (std::strcmp(argv[i], "--validate-wact") == 0 && i + 1 < argc) {
outRc = handleValidate(i, argc, argv); return true;
}
return false;
}
} // namespace cli
} // namespace editor
} // namespace wowee

12
tools/editor/cli_action_bars_catalog.hpp Normal file
View file

@ -0,0 +1,12 @@
#pragma once
namespace wowee {
namespace editor {
namespace cli {
bool handleActionBarsCatalog(int& i, int argc, char** argv,
int& outRc);
} // namespace cli
} // namespace editor
} // namespace wowee

2
tools/editor/cli_arg_required.cpp
View file

@ -291,6 +291,8 @@ const char* const kArgRequired[] = {
"--gen-stm", "--gen-stm-regen", "--gen-stm-armor",
"--info-wstm", "--validate-wstm",
"--export-wstm-json", "--import-wstm-json",
"--gen-act", "--gen-act-mage", "--gen-act-pet",
"--info-wact", "--validate-wact",
"--gen-weather-temperate", "--gen-weather-arctic",
"--gen-weather-desert", "--gen-weather-stormy",
"--gen-zone-atmosphere",

2
tools/editor/cli_dispatch.cpp
View file

@ -139,6 +139,7 @@
#include "cli_instance_lockouts_catalog.hpp"
#include "cli_stable_slots_catalog.hpp"
#include "cli_stat_curves_catalog.hpp"
#include "cli_action_bars_catalog.hpp"
#include "cli_quest_objective.hpp"
#include "cli_quest_reward.hpp"
#include "cli_clone.hpp"
@ -319,6 +320,7 @@ constexpr DispatchFn kDispatchTable[] = {
handleInstanceLockoutsCatalog,
handleStableSlotsCatalog,
handleStatCurvesCatalog,
handleActionBarsCatalog,
handleQuestObjective,
handleQuestReward,
handleClone,

1
tools/editor/cli_format_table.cpp
View file

@ -97,6 +97,7 @@ constexpr FormatMagicEntry kFormats[] = {
{{'W','H','L','D'}, ".whld", "raid", "--info-whld", "Instance lockout schedule catalog"},
{{'W','S','T','C'}, ".wstc", "pets", "--info-wstc", "Hunter stable slot catalog"},
{{'W','S','T','M'}, ".wstm", "stats", "--info-wstm", "Stat modifier curve catalog"},
{{'W','A','C','T'}, ".wact", "ui", "--info-wact", "Action bar layout catalog"},
{{'W','F','A','C'}, ".wfac", "factions", nullptr, "Faction catalog"},
{{'W','L','C','K'}, ".wlck", "locks", nullptr, "Lock catalog"},
{{'W','S','K','L'}, ".wskl", "skills", nullptr, "Skill catalog"},

10
tools/editor/cli_help.cpp
View file

@ -2083,6 +2083,16 @@ void printUsage(const char* argv0) {
std::printf(" Export binary .wstm to a human-editable JSON sidecar (defaults to <base>.wstm.json)\n");
std::printf(" --import-wstm-json <json-path> [out-base]\n");
std::printf(" Import a .wstm.json sidecar back into binary .wstm (accepts curveKind int OR curveKindName string)\n");
std::printf(" --gen-act <wact-base> [name]\n");
std::printf(" Emit .wact 10 Warrior starter bindings on Main bar (Heroic Strike / Charge / Rend / Thunder Clap / Battle Shout / Sunder Armor / Mocking Blow / Hamstring / Overpower / Victory Rush)\n");
std::printf(" --gen-act-mage <wact-base> [name]\n");
std::printf(" Emit .wact 10 Mage starter bindings on Main bar (Fireball / Frostbolt / Frost Nova / Polymorph / Mage Armor / Arcane Intellect / Counterspell / Blink / Fire Blast / Conjure Water)\n");
std::printf(" --gen-act-pet <wact-base> [name]\n");
std::printf(" Emit .wact 10 Hunter pet-bar bindings on Pet bar mode (Attack / Follow / Stay / Aggressive / Defensive / Passive / Bite / Claw / Growl / Dismiss)\n");
std::printf(" --info-wact <wact-base> [--json]\n");
std::printf(" Print WACT entries (id / classMask / barMode / buttonSlot / spellId / itemId / name)\n");
std::printf(" --validate-wact <wact-base> [--json]\n");
std::printf(" Static checks: id+name+classMask required, barMode 0..6, no duplicate ids; warns on slot>143, both spellId+itemId set, both 0 (empty button), and (classMask+barMode+slot) collisions for overlapping classes\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");

1
tools/editor/cli_list_formats.cpp
View file

@ -119,6 +119,7 @@ constexpr FormatRow kFormats[] = {
{"WHLD", ".whld", "raid", "InstanceTemplate.dbc reset fields","Instance lockout schedule catalog"},
{"WSTC", ".wstc", "pets", "stable_slot SQL + hunter UI", "Hunter stable slot catalog"},
{"WSTM", ".wstm", "stats", "gtChanceTo*.dbc + gtRegen*.dbc", "Stat modifier curve catalog"},
{"WACT", ".wact", "ui", "Hardcoded class default action bar","Action bar layout catalog"},
// Additional pipeline catalogs without the alternating
// gen/info/validate CLI surface (loaded by the engine