phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-22 23:30:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: use actual pct in durability death message, fix pet cast failure feedback

Browse source 
- SMSG_DURABILITY_DAMAGE_DEATH: use the actual pct field from the packet
  instead of hardcoding "10%"
- SMSG_PET_CAST_FAILED: read reason as uint8 (not uint32), look up spell
  name and show human-readable failure reason to player
- Trade status 9 (REJECTED): show "Trade declined." instead of "Trade
  cancelled." to distinguish explicit decline from cancellation
This commit is contained in:
Kelsi 2026-03-13 06:30:30 -07:00
parent 2a52aedbf7
commit b1015abffe
1 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/game/game_handler.cpp
View file

@ -3243,8 +3243,11 @@ void GameHandler::handlePacket(network::Packet& packet) {
case Opcode::SMSG_DURABILITY_DAMAGE_DEATH: {
// uint32 percent (how much durability was lost due to death)
if (packet.getSize() - packet.getReadPos() >= 4) {
/*uint32_t pct =*/ packet.readUInt32();
addSystemChatMessage("You have lost 10% of your gear's durability due to death.");
uint32_t pct = packet.readUInt32();
char buf[80];
std::snprintf(buf, sizeof(buf),
"You have lost %u%% of your gear's durability due to death.", pct);
addSystemChatMessage(buf);
}
break;
}
@ -6869,10 +6872,20 @@ void GameHandler::handlePacket(network::Packet& packet) {
if (packet.getSize() - packet.getReadPos() >= 5) {
uint8_t castCount = packet.readUInt8();
uint32_t spellId = packet.readUInt32();
uint32_t reason = (packet.getSize() - packet.getReadPos() >= 4)
? packet.readUInt32() : 0;
uint8_t reason = (packet.getSize() - packet.getReadPos() >= 1)
? packet.readUInt8() : 0;
LOG_DEBUG("SMSG_PET_CAST_FAILED: spell=", spellId,
" reason=", reason, " castCount=", (int)castCount);
" reason=", (int)reason, " castCount=", (int)castCount);
if (reason != 0) {
const char* reasonStr = getSpellCastResultString(reason);
const std::string& sName = getSpellName(spellId);
std::string errMsg;
if (reasonStr && *reasonStr)
errMsg = sName.empty() ? reasonStr : (sName + ": " + reasonStr);
else
errMsg = sName.empty() ? "Pet spell failed." : (sName + ": Pet spell failed.");
addSystemChatMessage(errMsg);
}
}
packet.setReadPos(packet.getSize());
break;
@ -21999,12 +22012,15 @@ void GameHandler::handleTradeStatus(network::Packet& packet) {
tradeStatus_ = TradeStatus::Open;
addSystemChatMessage("Trade window opened.");
break;
case 3: // CANCELLED
case 9: // REJECTED
case 3: // CANCELLED
case 12: // CLOSE_WINDOW
resetTradeState();
addSystemChatMessage("Trade cancelled.");
break;
case 9: // REJECTED — other player clicked Decline
resetTradeState();
addSystemChatMessage("Trade declined.");
break;
case 4: // ACCEPTED (partner accepted)
tradeStatus_ = TradeStatus::Accepted;
addSystemChatMessage("Trade accepted. Awaiting other player...");