mirror of
https://github.com/Kelsidavis/WoWee.git
synced 2026-03-25 08:30:13 +00:00
Fix spell targeting, item query parsing, loot UI, hair/skin textures, and attack animations
Fix spell cast target fallback using selected target instead of no-op tautology. Fix SMSG_ITEM_QUERY_SINGLE_RESPONSE to always read 10 stat pairs (server sends all 10 regardless of statsCount), fixing misaligned armor/stat reads. Fix XP gain parser to read float groupRate + uint8 RAF instead of bogus uint32 groupBonus. Add item icons and quality-colored names to loot window. Use actual character appearance bytes for CharSections.dbc skin/face/hair lookups instead of hardcoded defaults. Add weapon-type-aware attack animation selection (2H prioritizes anim 18). Add readable spell cast failure messages and vendor sell hint.
This commit is contained in:
Kelsi
parent
29c1326845
commit
deabe0bedd
9 changed files with 338 additions and 54 deletions
|
|
@ -787,6 +787,21 @@ void Application::spawnPlayerCharacter() {
|
|||
std::string faceLowerTexturePath;
|
||||
std::vector<std::string> underwearPaths;
|
||||
|
||||
// Extract appearance bytes for texture lookups
|
||||
uint8_t charSkinId = 0, charFaceId = 0, charHairStyleId = 0, charHairColorId = 0;
|
||||
if (gameHandler) {
|
||||
const game::Character* activeChar = gameHandler->getActiveCharacter();
|
||||
if (activeChar) {
|
||||
charSkinId = activeChar->appearanceBytes & 0xFF;
|
||||
charFaceId = (activeChar->appearanceBytes >> 8) & 0xFF;
|
||||
charHairStyleId = (activeChar->appearanceBytes >> 16) & 0xFF;
|
||||
charHairColorId = (activeChar->appearanceBytes >> 24) & 0xFF;
|
||||
LOG_INFO("Appearance: skin=", (int)charSkinId, " face=", (int)charFaceId,
|
||||
" hairStyle=", (int)charHairStyleId, " hairColor=", (int)charHairColorId);
|
||||
}
|
||||
}
|
||||
|
||||
std::string hairTexturePath;
|
||||
if (useCharSections) {
|
||||
auto charSectionsDbc = assetManager->loadDBC("CharSections.dbc");
|
||||
if (charSectionsDbc) {
|
||||
|
|
@ -794,6 +809,7 @@ void Application::spawnPlayerCharacter() {
|
|||
bool foundSkin = false;
|
||||
bool foundUnderwear = false;
|
||||
bool foundFaceLower = false;
|
||||
bool foundHair = false;
|
||||
for (uint32_t r = 0; r < charSectionsDbc->getRecordCount(); r++) {
|
||||
uint32_t raceId = charSectionsDbc->getUInt32(r, 1);
|
||||
uint32_t sexId = charSectionsDbc->getUInt32(r, 2);
|
||||
|
|
@ -803,23 +819,37 @@ void Application::spawnPlayerCharacter() {
|
|||
|
||||
if (raceId != targetRaceId || sexId != targetSexId) continue;
|
||||
|
||||
if (baseSection == 0 && !foundSkin && variationIndex == 0 && colorIndex == 0) {
|
||||
// Section 0 = skin: match by colorIndex = skin byte
|
||||
if (baseSection == 0 && !foundSkin && colorIndex == charSkinId) {
|
||||
std::string tex1 = charSectionsDbc->getString(r, 4);
|
||||
if (!tex1.empty()) {
|
||||
bodySkinPath = tex1;
|
||||
foundSkin = true;
|
||||
LOG_INFO(" DBC body skin: ", bodySkinPath);
|
||||
LOG_INFO(" DBC body skin: ", bodySkinPath, " (skin=", (int)charSkinId, ")");
|
||||
}
|
||||
} else if (baseSection == 3 && colorIndex == 0) {
|
||||
(void)variationIndex;
|
||||
} else if (baseSection == 1 && !foundFaceLower && variationIndex == 0 && colorIndex == 0) {
|
||||
}
|
||||
// Section 3 = hair: match variation=hairStyle, color=hairColor
|
||||
else if (baseSection == 3 && !foundHair &&
|
||||
variationIndex == charHairStyleId && colorIndex == charHairColorId) {
|
||||
hairTexturePath = charSectionsDbc->getString(r, 4);
|
||||
if (!hairTexturePath.empty()) {
|
||||
foundHair = true;
|
||||
LOG_INFO(" DBC hair texture: ", hairTexturePath,
|
||||
" (style=", (int)charHairStyleId, " color=", (int)charHairColorId, ")");
|
||||
}
|
||||
}
|
||||
// Section 1 = face lower: match variation=faceId
|
||||
else if (baseSection == 1 && !foundFaceLower &&
|
||||
variationIndex == charFaceId && colorIndex == charSkinId) {
|
||||
std::string tex1 = charSectionsDbc->getString(r, 4);
|
||||
if (!tex1.empty()) {
|
||||
faceLowerTexturePath = tex1;
|
||||
foundFaceLower = true;
|
||||
LOG_INFO(" DBC face texture: ", faceLowerTexturePath);
|
||||
}
|
||||
} else if (baseSection == 4 && !foundUnderwear && variationIndex == 0 && colorIndex == 0) {
|
||||
}
|
||||
// Section 4 = underwear
|
||||
else if (baseSection == 4 && !foundUnderwear && colorIndex == charSkinId) {
|
||||
for (int f = 4; f <= 6; f++) {
|
||||
std::string tex = charSectionsDbc->getString(r, f);
|
||||
if (!tex.empty()) {
|
||||
|
|
@ -829,36 +859,19 @@ void Application::spawnPlayerCharacter() {
|
|||
}
|
||||
foundUnderwear = true;
|
||||
}
|
||||
|
||||
if (foundSkin && foundHair && foundFaceLower && foundUnderwear) break;
|
||||
}
|
||||
|
||||
if (!foundHair) {
|
||||
LOG_WARNING("No DBC hair match for style=", (int)charHairStyleId,
|
||||
" color=", (int)charHairColorId,
|
||||
" race=", targetRaceId, " sex=", targetSexId);
|
||||
}
|
||||
} else {
|
||||
LOG_WARNING("Failed to load CharSections.dbc, using hardcoded textures");
|
||||
}
|
||||
|
||||
// Look up hair texture from CharSections.dbc section 3
|
||||
std::string hairTexturePath;
|
||||
if (gameHandler) {
|
||||
const game::Character* activeChar = gameHandler->getActiveCharacter();
|
||||
if (activeChar) {
|
||||
uint8_t hairStyleId = (activeChar->appearanceBytes >> 16) & 0xFF;
|
||||
uint8_t hairColorId = (activeChar->appearanceBytes >> 24) & 0xFF;
|
||||
for (uint32_t r = 0; r < charSectionsDbc->getRecordCount(); r++) {
|
||||
uint32_t raceId = charSectionsDbc->getUInt32(r, 1);
|
||||
uint32_t sexId = charSectionsDbc->getUInt32(r, 2);
|
||||
uint32_t section = charSectionsDbc->getUInt32(r, 3);
|
||||
uint32_t variation = charSectionsDbc->getUInt32(r, 8);
|
||||
uint32_t colorIdx = charSectionsDbc->getUInt32(r, 9);
|
||||
if (raceId != targetRaceId || sexId != targetSexId) continue;
|
||||
if (section != 3) continue;
|
||||
if (variation != hairStyleId) continue;
|
||||
if (colorIdx != hairColorId) continue;
|
||||
hairTexturePath = charSectionsDbc->getString(r, 4);
|
||||
LOG_INFO(" DBC hair texture: ", hairTexturePath,
|
||||
" (style=", (int)hairStyleId, " color=", (int)hairColorId, ")");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (auto& tex : model.textures) {
|
||||
if (tex.type == 1 && tex.filename.empty()) {
|
||||
tex.filename = bodySkinPath;
|
||||
|
|
|
|||
|
|
@ -3309,7 +3309,7 @@ void GameHandler::castSpell(uint32_t spellId, uint64_t targetGuid) {
|
|||
|
||||
if (casting) return; // Already casting
|
||||
|
||||
uint64_t target = targetGuid != 0 ? targetGuid : targetGuid;
|
||||
uint64_t target = targetGuid != 0 ? targetGuid : this->targetGuid;
|
||||
auto packet = CastSpellPacket::build(spellId, target, ++castCount);
|
||||
socket->send(packet);
|
||||
LOG_INFO("Casting spell: ", spellId, " on 0x", std::hex, target, std::dec);
|
||||
|
|
@ -3389,11 +3389,16 @@ void GameHandler::handleCastFailed(network::Packet& packet) {
|
|||
currentCastSpellId = 0;
|
||||
castTimeRemaining = 0.0f;
|
||||
|
||||
// Add system message about failed cast
|
||||
// Add system message about failed cast with readable reason
|
||||
const char* reason = getSpellCastResultString(data.result);
|
||||
MessageChatData msg;
|
||||
msg.type = ChatType::SYSTEM;
|
||||
msg.language = ChatLanguage::UNIVERSAL;
|
||||
msg.message = "Spell cast failed (error " + std::to_string(data.result) + ")";
|
||||
if (reason) {
|
||||
msg.message = reason;
|
||||
} else {
|
||||
msg.message = "Spell cast failed (error " + std::to_string(data.result) + ")";
|
||||
}
|
||||
addLocalChatMessage(msg);
|
||||
}
|
||||
|
||||
|
|
@ -4310,8 +4315,8 @@ void GameHandler::simulateXpGain(uint64_t victimGuid, uint32_t totalXp) {
|
|||
packet.writeUInt64(victimGuid);
|
||||
packet.writeUInt32(totalXp);
|
||||
packet.writeUInt8(0); // kill XP
|
||||
packet.writeFloat(0.0f);
|
||||
packet.writeUInt32(0); // group bonus
|
||||
packet.writeFloat(1.0f); // group rate (1.0 = solo, no bonus)
|
||||
packet.writeUInt8(0); // RAF flag
|
||||
handleXpGain(packet);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1326,16 +1326,19 @@ bool ItemQueryResponseParser::parse(network::Packet& packet, ItemQueryResponseDa
|
|||
data.containerSlots = packet.readUInt32();
|
||||
|
||||
uint32_t statsCount = packet.readUInt32();
|
||||
for (uint32_t i = 0; i < statsCount && i < 10; i++) {
|
||||
// Server always sends 10 stat pairs; statsCount tells how many are meaningful
|
||||
for (uint32_t i = 0; i < 10; i++) {
|
||||
uint32_t statType = packet.readUInt32();
|
||||
int32_t statValue = static_cast<int32_t>(packet.readUInt32());
|
||||
switch (statType) {
|
||||
case 3: data.agility = statValue; break;
|
||||
case 4: data.strength = statValue; break;
|
||||
case 5: data.intellect = statValue; break;
|
||||
case 6: data.spirit = statValue; break;
|
||||
case 7: data.stamina = statValue; break;
|
||||
default: break;
|
||||
if (i < statsCount) {
|
||||
switch (statType) {
|
||||
case 3: data.agility = statValue; break;
|
||||
case 4: data.strength = statValue; break;
|
||||
case 5: data.intellect = statValue; break;
|
||||
case 6: data.spirit = statValue; break;
|
||||
case 7: data.stamina = statValue; break;
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1585,9 +1588,13 @@ bool XpGainParser::parse(network::Packet& packet, XpGainData& data) {
|
|||
data.totalXp = packet.readUInt32();
|
||||
data.type = packet.readUInt8();
|
||||
if (data.type == 0) {
|
||||
// Kill XP: has group bonus float (unused) + group bonus uint32
|
||||
packet.readFloat();
|
||||
data.groupBonus = packet.readUInt32();
|
||||
// Kill XP: float groupRate (1.0 = solo) + uint8 RAF flag
|
||||
float groupRate = packet.readFloat();
|
||||
packet.readUInt8(); // RAF bonus flag
|
||||
// Group bonus = total - (total / rate); only if grouped (rate > 1)
|
||||
if (groupRate > 1.0f) {
|
||||
data.groupBonus = data.totalXp - static_cast<uint32_t>(data.totalXp / groupRate);
|
||||
}
|
||||
}
|
||||
LOG_INFO("XP gain: ", data.totalXp, " xp (type=", static_cast<int>(data.type), ")");
|
||||
return data.totalXp > 0;
|
||||
|
|
|
|||
|
|
@ -391,9 +391,26 @@ uint32_t Renderer::resolveMeleeAnimId() {
|
|||
return 0.0f;
|
||||
};
|
||||
|
||||
// Prefer weapon attacks (1H=17, 2H=18) over unarmed (16); 19-21 are other variants
|
||||
const uint32_t attackCandidates[] = {17, 18, 16, 19, 20, 21};
|
||||
for (uint32_t id : attackCandidates) {
|
||||
// Select animation priority based on equipped weapon type
|
||||
// WoW inventory types: 17 = 2H weapon, 13/21 = 1H, 0 = unarmed
|
||||
// WoW anim IDs: 16 = unarmed, 17 = 1H attack, 18 = 2H attack
|
||||
const uint32_t* attackCandidates;
|
||||
size_t candidateCount;
|
||||
static const uint32_t candidates2H[] = {18, 17, 16, 19, 20, 21};
|
||||
static const uint32_t candidates1H[] = {17, 18, 16, 19, 20, 21};
|
||||
static const uint32_t candidatesUnarmed[] = {16, 17, 18, 19, 20, 21};
|
||||
if (equippedWeaponInvType_ == 17) { // INVTYPE_2HWEAPON
|
||||
attackCandidates = candidates2H;
|
||||
candidateCount = 6;
|
||||
} else if (equippedWeaponInvType_ == 0) {
|
||||
attackCandidates = candidatesUnarmed;
|
||||
candidateCount = 6;
|
||||
} else {
|
||||
attackCandidates = candidates1H;
|
||||
candidateCount = 6;
|
||||
}
|
||||
for (size_t ci = 0; ci < candidateCount; ci++) {
|
||||
uint32_t id = attackCandidates[ci];
|
||||
if (characterRenderer->hasAnimation(characterInstanceId, id)) {
|
||||
meleeAnimId = id;
|
||||
meleeAnimDurationMs = findDuration(id);
|
||||
|
|
|
|||
|
|
@ -149,6 +149,12 @@ void GameScreen::render(game::GameHandler& gameHandler) {
|
|||
core::Application::getInstance().loadEquippedWeapons();
|
||||
gameHandler.notifyEquipmentChanged();
|
||||
inventoryScreen.markPreviewDirty();
|
||||
// Update renderer weapon type for animation selection
|
||||
auto* r = core::Application::getInstance().getRenderer();
|
||||
if (r) {
|
||||
const auto& mh = gameHandler.getInventory().getEquipSlot(game::EquipSlot::MAIN_HAND);
|
||||
r->setEquippedWeaponType(mh.empty() ? 0 : mh.item.inventoryType);
|
||||
}
|
||||
}
|
||||
|
||||
// Update renderer face-target position and selection circle
|
||||
|
|
@ -1723,14 +1729,73 @@ void GameScreen::renderLootWindow(game::GameHandler& gameHandler) {
|
|||
ImGui::Separator();
|
||||
}
|
||||
|
||||
// Items
|
||||
// Items with icons and labels
|
||||
constexpr float iconSize = 32.0f;
|
||||
for (const auto& item : loot.items) {
|
||||
ImGui::PushID(item.slotIndex);
|
||||
char label[64];
|
||||
snprintf(label, sizeof(label), "Item %u (x%u)", item.itemId, item.count);
|
||||
if (ImGui::Selectable(label)) {
|
||||
|
||||
// Get item info for name and quality
|
||||
const auto* info = gameHandler.getItemInfo(item.itemId);
|
||||
std::string itemName = info && !info->name.empty()
|
||||
? info->name
|
||||
: "Item #" + std::to_string(item.itemId);
|
||||
game::ItemQuality quality = info
|
||||
? static_cast<game::ItemQuality>(info->quality)
|
||||
: game::ItemQuality::COMMON;
|
||||
ImVec4 qColor = InventoryScreen::getQualityColor(quality);
|
||||
|
||||
// Get item icon
|
||||
uint32_t displayId = item.displayInfoId;
|
||||
if (displayId == 0 && info) displayId = info->displayInfoId;
|
||||
GLuint iconTex = inventoryScreen.getItemIcon(displayId);
|
||||
|
||||
ImVec2 cursor = ImGui::GetCursorScreenPos();
|
||||
float rowH = std::max(iconSize, ImGui::GetTextLineHeight() * 2.0f);
|
||||
|
||||
// Invisible selectable for click handling
|
||||
if (ImGui::Selectable("##loot", false, 0, ImVec2(0, rowH))) {
|
||||
gameHandler.lootItem(item.slotIndex);
|
||||
}
|
||||
bool hovered = ImGui::IsItemHovered();
|
||||
|
||||
ImDrawList* drawList = ImGui::GetWindowDrawList();
|
||||
|
||||
// Draw hover highlight
|
||||
if (hovered) {
|
||||
drawList->AddRectFilled(cursor,
|
||||
ImVec2(cursor.x + ImGui::GetContentRegionAvail().x + iconSize + 8.0f,
|
||||
cursor.y + rowH),
|
||||
IM_COL32(255, 255, 255, 30));
|
||||
}
|
||||
|
||||
// Draw icon
|
||||
if (iconTex) {
|
||||
drawList->AddImage((ImTextureID)(uintptr_t)iconTex,
|
||||
cursor, ImVec2(cursor.x + iconSize, cursor.y + iconSize));
|
||||
drawList->AddRect(cursor, ImVec2(cursor.x + iconSize, cursor.y + iconSize),
|
||||
ImGui::ColorConvertFloat4ToU32(qColor));
|
||||
} else {
|
||||
drawList->AddRectFilled(cursor,
|
||||
ImVec2(cursor.x + iconSize, cursor.y + iconSize),
|
||||
IM_COL32(40, 40, 50, 200));
|
||||
drawList->AddRect(cursor, ImVec2(cursor.x + iconSize, cursor.y + iconSize),
|
||||
IM_COL32(80, 80, 80, 200));
|
||||
}
|
||||
|
||||
// Draw item name
|
||||
float textX = cursor.x + iconSize + 6.0f;
|
||||
float textY = cursor.y + 2.0f;
|
||||
drawList->AddText(ImVec2(textX, textY),
|
||||
ImGui::ColorConvertFloat4ToU32(qColor), itemName.c_str());
|
||||
|
||||
// Draw count if > 1
|
||||
if (item.count > 1) {
|
||||
char countStr[32];
|
||||
snprintf(countStr, sizeof(countStr), "x%u", item.count);
|
||||
float countY = textY + ImGui::GetTextLineHeight();
|
||||
drawList->AddText(ImVec2(textX, countY), IM_COL32(200, 200, 200, 220), countStr);
|
||||
}
|
||||
|
||||
ImGui::PopID();
|
||||
}
|
||||
|
||||
|
|
@ -1924,6 +1989,9 @@ void GameScreen::renderVendorWindow(game::GameHandler& gameHandler) {
|
|||
ImGui::Text("Your money: %ug %us %uc", mg, ms, mc);
|
||||
ImGui::Separator();
|
||||
|
||||
ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "Right-click bag items to sell");
|
||||
ImGui::Separator();
|
||||
|
||||
if (vendor.items.empty()) {
|
||||
ImGui::TextDisabled("This vendor has nothing for sale.");
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -642,7 +642,9 @@ void InventoryScreen::renderCharacterScreen(game::GameHandler& gameHandler) {
|
|||
|
||||
// Stats panel
|
||||
ImGui::Spacing();
|
||||
ImGui::Spacing();
|
||||
ImGui::Separator();
|
||||
ImGui::Spacing();
|
||||
renderStatsPanel(inventory, gameHandler.getPlayerLevel());
|
||||
|
||||
ImGui::End();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue