mirror of
https://github.com/Kelsidavis/WoWee.git
synced 2026-04-26 21:13:51 +00:00
Add animation_ids.hpp/cpp with all 452 WoW animation ID constants (anim::STAND, anim::RUN, anim::FIRE_BOW, ... anim::FLY_BACKWARDS, etc.), nameFromId() O(1) lookup, and flyVariant() compact 218-element ground→FLY_* resolver. Expand AnimationController into a full state machine with 20+ named states: spell cast (directed→omni→cast fallback chain, instant one-shot release), hit reactions (WOUND/CRIT/DODGE/BLOCK/SHIELD_BLOCK), stun, wounded idle, stealth animation substitution, loot, fishing channel, sit/sleep/kneel down→loop→up transitions, sheathe/unsheathe combat enter/exit, ranged weapons (BOW/GUN/CROSSBOW/THROWN with reload states), game object OPEN/CLOSE/DESTROY, vehicle enter/exit, mount flight directionals (FLY_LEFT/RIGHT/UP/DOWN/BACKWARDS), emote state variants, off-hand/pierce/dual-wield alternation, NPC birth/spawn/drown/rise, sprint aura override, totem idle, NPC greeting/farewell. Add spell_defines.hpp with SpellEffect (~45 constants) and SpellMissInfo (12 constants) namespaces; replace all magic numbers in spell_handler.cpp. Add GAMEOBJECT_BYTES_1 to update field table (all 4 expansion JSONs) and wire GameObjectStateCallback. Add DBC cross-validation on world entry. Expand tools/_ANIM_NAMES from ~35 to 452 entries in m2_viewer.py and asset_pipeline_gui.py. Add tests/test_animation_ids.cpp. Bug fixes included: - Stand state 1 was animating READY_2H(27) — fixed to SITTING(97) - Spell casts ended freeze-frame — add one-shot release animation - NPC 2H swing probe chain missing ATTACK_2H_LOOSE (polearm/staff) - Chair sits (states 2/4/5/6) incorrectly played floor-sit transition - STOP(3) used for all spell casts — replaced with model-aware chain
160 lines
6.5 KiB
C++
160 lines
6.5 KiB
C++
#include "game/update_field_table.hpp"
|
|
#include "core/logger.hpp"
|
|
#include <fstream>
|
|
#include <sstream>
|
|
#include <algorithm>
|
|
|
|
namespace wowee {
|
|
namespace game {
|
|
|
|
static const UpdateFieldTable* g_activeUpdateFieldTable = nullptr;
|
|
|
|
void setActiveUpdateFieldTable(const UpdateFieldTable* table) { g_activeUpdateFieldTable = table; }
|
|
const UpdateFieldTable* getActiveUpdateFieldTable() { return g_activeUpdateFieldTable; }
|
|
|
|
struct UFNameEntry {
|
|
const char* name;
|
|
UF field;
|
|
};
|
|
|
|
static const UFNameEntry kUFNames[] = {
|
|
{"OBJECT_FIELD_ENTRY", UF::OBJECT_FIELD_ENTRY},
|
|
{"OBJECT_FIELD_SCALE_X", UF::OBJECT_FIELD_SCALE_X},
|
|
{"UNIT_FIELD_TARGET_LO", UF::UNIT_FIELD_TARGET_LO},
|
|
{"UNIT_FIELD_TARGET_HI", UF::UNIT_FIELD_TARGET_HI},
|
|
{"UNIT_FIELD_BYTES_0", UF::UNIT_FIELD_BYTES_0},
|
|
{"UNIT_FIELD_HEALTH", UF::UNIT_FIELD_HEALTH},
|
|
{"UNIT_FIELD_POWER1", UF::UNIT_FIELD_POWER1},
|
|
{"UNIT_FIELD_MAXHEALTH", UF::UNIT_FIELD_MAXHEALTH},
|
|
{"UNIT_FIELD_MAXPOWER1", UF::UNIT_FIELD_MAXPOWER1},
|
|
{"UNIT_FIELD_LEVEL", UF::UNIT_FIELD_LEVEL},
|
|
{"UNIT_FIELD_FACTIONTEMPLATE", UF::UNIT_FIELD_FACTIONTEMPLATE},
|
|
{"UNIT_FIELD_FLAGS", UF::UNIT_FIELD_FLAGS},
|
|
{"UNIT_FIELD_FLAGS_2", UF::UNIT_FIELD_FLAGS_2},
|
|
{"UNIT_FIELD_DISPLAYID", UF::UNIT_FIELD_DISPLAYID},
|
|
{"UNIT_FIELD_MOUNTDISPLAYID", UF::UNIT_FIELD_MOUNTDISPLAYID},
|
|
{"UNIT_FIELD_AURAS", UF::UNIT_FIELD_AURAS},
|
|
{"UNIT_FIELD_AURAFLAGS", UF::UNIT_FIELD_AURAFLAGS},
|
|
{"UNIT_NPC_FLAGS", UF::UNIT_NPC_FLAGS},
|
|
{"UNIT_NPC_EMOTESTATE", UF::UNIT_NPC_EMOTESTATE},
|
|
{"UNIT_DYNAMIC_FLAGS", UF::UNIT_DYNAMIC_FLAGS},
|
|
{"UNIT_FIELD_RESISTANCES", UF::UNIT_FIELD_RESISTANCES},
|
|
{"UNIT_FIELD_STAT0", UF::UNIT_FIELD_STAT0},
|
|
{"UNIT_FIELD_STAT1", UF::UNIT_FIELD_STAT1},
|
|
{"UNIT_FIELD_STAT2", UF::UNIT_FIELD_STAT2},
|
|
{"UNIT_FIELD_STAT3", UF::UNIT_FIELD_STAT3},
|
|
{"UNIT_FIELD_STAT4", UF::UNIT_FIELD_STAT4},
|
|
{"UNIT_END", UF::UNIT_END},
|
|
{"UNIT_FIELD_ATTACK_POWER", UF::UNIT_FIELD_ATTACK_POWER},
|
|
{"UNIT_FIELD_RANGED_ATTACK_POWER", UF::UNIT_FIELD_RANGED_ATTACK_POWER},
|
|
{"PLAYER_FLAGS", UF::PLAYER_FLAGS},
|
|
{"PLAYER_BYTES", UF::PLAYER_BYTES},
|
|
{"PLAYER_BYTES_2", UF::PLAYER_BYTES_2},
|
|
{"PLAYER_XP", UF::PLAYER_XP},
|
|
{"PLAYER_NEXT_LEVEL_XP", UF::PLAYER_NEXT_LEVEL_XP},
|
|
{"PLAYER_FIELD_COINAGE", UF::PLAYER_FIELD_COINAGE},
|
|
{"PLAYER_QUEST_LOG_START", UF::PLAYER_QUEST_LOG_START},
|
|
{"PLAYER_FIELD_INV_SLOT_HEAD", UF::PLAYER_FIELD_INV_SLOT_HEAD},
|
|
{"PLAYER_FIELD_PACK_SLOT_1", UF::PLAYER_FIELD_PACK_SLOT_1},
|
|
{"PLAYER_FIELD_KEYRING_SLOT_1", UF::PLAYER_FIELD_KEYRING_SLOT_1},
|
|
{"PLAYER_FIELD_BANK_SLOT_1", UF::PLAYER_FIELD_BANK_SLOT_1},
|
|
{"PLAYER_FIELD_BANKBAG_SLOT_1", UF::PLAYER_FIELD_BANKBAG_SLOT_1},
|
|
{"PLAYER_SKILL_INFO_START", UF::PLAYER_SKILL_INFO_START},
|
|
{"PLAYER_EXPLORED_ZONES_START", UF::PLAYER_EXPLORED_ZONES_START},
|
|
{"GAMEOBJECT_DISPLAYID", UF::GAMEOBJECT_DISPLAYID},
|
|
{"GAMEOBJECT_BYTES_1", UF::GAMEOBJECT_BYTES_1},
|
|
{"ITEM_FIELD_STACK_COUNT", UF::ITEM_FIELD_STACK_COUNT},
|
|
{"ITEM_FIELD_DURABILITY", UF::ITEM_FIELD_DURABILITY},
|
|
{"ITEM_FIELD_MAXDURABILITY", UF::ITEM_FIELD_MAXDURABILITY},
|
|
{"PLAYER_REST_STATE_EXPERIENCE", UF::PLAYER_REST_STATE_EXPERIENCE},
|
|
{"PLAYER_CHOSEN_TITLE", UF::PLAYER_CHOSEN_TITLE},
|
|
{"PLAYER_FIELD_MOD_DAMAGE_DONE_POS", UF::PLAYER_FIELD_MOD_DAMAGE_DONE_POS},
|
|
{"PLAYER_FIELD_MOD_HEALING_DONE_POS", UF::PLAYER_FIELD_MOD_HEALING_DONE_POS},
|
|
{"PLAYER_BLOCK_PERCENTAGE", UF::PLAYER_BLOCK_PERCENTAGE},
|
|
{"PLAYER_DODGE_PERCENTAGE", UF::PLAYER_DODGE_PERCENTAGE},
|
|
{"PLAYER_PARRY_PERCENTAGE", UF::PLAYER_PARRY_PERCENTAGE},
|
|
{"PLAYER_CRIT_PERCENTAGE", UF::PLAYER_CRIT_PERCENTAGE},
|
|
{"PLAYER_RANGED_CRIT_PERCENTAGE", UF::PLAYER_RANGED_CRIT_PERCENTAGE},
|
|
{"PLAYER_SPELL_CRIT_PERCENTAGE1", UF::PLAYER_SPELL_CRIT_PERCENTAGE1},
|
|
{"PLAYER_FIELD_COMBAT_RATING_1", UF::PLAYER_FIELD_COMBAT_RATING_1},
|
|
{"PLAYER_FIELD_HONOR_CURRENCY", UF::PLAYER_FIELD_HONOR_CURRENCY},
|
|
{"PLAYER_FIELD_ARENA_CURRENCY", UF::PLAYER_FIELD_ARENA_CURRENCY},
|
|
{"CONTAINER_FIELD_NUM_SLOTS", UF::CONTAINER_FIELD_NUM_SLOTS},
|
|
{"CONTAINER_FIELD_SLOT_1", UF::CONTAINER_FIELD_SLOT_1},
|
|
};
|
|
|
|
static constexpr size_t kUFNameCount = sizeof(kUFNames) / sizeof(kUFNames[0]);
|
|
|
|
bool UpdateFieldTable::loadFromJson(const std::string& path) {
|
|
std::ifstream f(path);
|
|
if (!f.is_open()) {
|
|
LOG_WARNING("UpdateFieldTable: cannot open ", path);
|
|
return false;
|
|
}
|
|
|
|
std::string json((std::istreambuf_iterator<char>(f)), std::istreambuf_iterator<char>());
|
|
|
|
fieldMap_.clear();
|
|
size_t loaded = 0;
|
|
size_t pos = 0;
|
|
|
|
while (pos < json.size()) {
|
|
size_t keyStart = json.find('"', pos);
|
|
if (keyStart == std::string::npos) break;
|
|
size_t keyEnd = json.find('"', keyStart + 1);
|
|
if (keyEnd == std::string::npos) break;
|
|
std::string key = json.substr(keyStart + 1, keyEnd - keyStart - 1);
|
|
|
|
size_t colon = json.find(':', keyEnd);
|
|
if (colon == std::string::npos) break;
|
|
|
|
size_t valStart = colon + 1;
|
|
while (valStart < json.size() && (json[valStart] == ' ' || json[valStart] == '\t' ||
|
|
json[valStart] == '\r' || json[valStart] == '\n'))
|
|
++valStart;
|
|
|
|
size_t valEnd = json.find_first_of(",}\r\n", valStart);
|
|
if (valEnd == std::string::npos) valEnd = json.size();
|
|
std::string valStr = json.substr(valStart, valEnd - valStart);
|
|
// Trim whitespace
|
|
while (!valStr.empty() && (valStr.back() == ' ' || valStr.back() == '\t'))
|
|
valStr.pop_back();
|
|
|
|
uint16_t idx = 0;
|
|
try { idx = static_cast<uint16_t>(std::stoul(valStr)); } catch (...) {
|
|
pos = valEnd + 1;
|
|
continue;
|
|
}
|
|
|
|
// Find matching UF enum
|
|
for (size_t i = 0; i < kUFNameCount; ++i) {
|
|
if (key == kUFNames[i].name) {
|
|
fieldMap_[static_cast<uint16_t>(kUFNames[i].field)] = idx;
|
|
++loaded;
|
|
break;
|
|
}
|
|
}
|
|
|
|
pos = valEnd + 1;
|
|
}
|
|
|
|
if (loaded == 0) {
|
|
LOG_WARNING("UpdateFieldTable: no fields loaded from ", path);
|
|
return false;
|
|
}
|
|
|
|
LOG_INFO("UpdateFieldTable: loaded ", loaded, " fields from ", path);
|
|
return true;
|
|
}
|
|
|
|
uint16_t UpdateFieldTable::index(UF field) const {
|
|
auto it = fieldMap_.find(static_cast<uint16_t>(field));
|
|
return (it != fieldMap_.end()) ? it->second : 0xFFFF;
|
|
}
|
|
|
|
bool UpdateFieldTable::hasField(UF field) const {
|
|
return fieldMap_.count(static_cast<uint16_t>(field)) > 0;
|
|
}
|
|
|
|
} // namespace game
|
|
} // namespace wowee
|