phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-03 16:03:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Scope chest loot retry workaround to Turtle expansion only

Browse source
This commit is contained in:
Kelsi 2026-02-18 04:18:51 -08:00
parent fdaa5d252b
commit e14dddbf54
1 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/game/game_handler.cpp
View file

@ -6,6 +6,7 @@
#include "game/warden_module.hpp" #include "game/warden_module.hpp"
#include "game/opcodes.hpp" #include "game/opcodes.hpp"
#include "game/update_field_table.hpp" #include "game/update_field_table.hpp"
#include "game/expansion_profile.hpp"
#include "rendering/renderer.hpp" #include "rendering/renderer.hpp"
#include "audio/spell_sound_manager.hpp" #include "audio/spell_sound_manager.hpp"
#include "audio/ui_sound_manager.hpp" #include "audio/ui_sound_manager.hpp"
@ -74,6 +75,15 @@ bool isAuthCharPipelineOpcode(LogicalOpcode op) {
} }
} }
bool isActiveExpansion(const char* expansionId) {
auto& app = core::Application::getInstance();
auto* registry = app.getExpansionRegistry();
if (!registry) return false;
auto* profile = registry->getActive();
if (!profile) return false;
return profile->id == expansionId;
}
std::string formatCopperAmount(uint32_t amount) { std::string formatCopperAmount(uint32_t amount) {
uint32_t gold = amount / 10000; uint32_t gold = amount / 10000;
uint32_t silver = (amount / 100) % 100; uint32_t silver = (amount / 100) % 100;
@ -8098,7 +8108,8 @@ void GameHandler::interactWithGameObject(uint64_t guid) {
// In Vanilla/Classic there is no SMSG_SHOW_MAILBOX — the server just sends // In Vanilla/Classic there is no SMSG_SHOW_MAILBOX — the server just sends
// animation/sound and expects the client to request the mail list. // animation/sound and expects the client to request the mail list.
bool isMailbox = false; bool isMailbox = false;
bool shouldSendLoot = true; bool turtleMode = isActiveExpansion("turtle");
bool shouldSendLoot = (entity == nullptr);
if (entity && entity->getType() == ObjectType::GAMEOBJECT) { if (entity && entity->getType() == ObjectType::GAMEOBJECT) {
auto go = std::static_pointer_cast<GameObject>(entity); auto go = std::static_pointer_cast<GameObject>(entity);
auto* info = getCachedGameObjectInfo(go->getEntry()); auto* info = getCachedGameObjectInfo(go->getEntry());
@ -8112,13 +8123,29 @@ void GameHandler::interactWithGameObject(uint64_t guid) {
selectedMailIndex_ = -1; selectedMailIndex_ = -1;
showMailCompose_ = false; showMailCompose_ = false;
refreshMailList(); refreshMailList();
} else {
// Keep non-Turtle behavior constrained to known lootable GO types.
if (!turtleMode) {
if (info && (info->type == 3 || info->type == 25)) {
shouldSendLoot = true;
} else if (info) {
shouldSendLoot = false;
} else {
shouldSendLoot = true;
}
} else {
// Turtle compatibility: aggressively pair use+loot for chest-like objects.
shouldSendLoot = true;
}
} }
} }
if (shouldSendLoot) { if (shouldSendLoot) {
LOG_INFO("GameObject interaction: sent CMSG_GAMEOBJECT_USE + CMSG_LOOT for guid=0x", std::hex, guid, std::dec, LOG_INFO("GameObject interaction: sent CMSG_GAMEOBJECT_USE + CMSG_LOOT for guid=0x", std::hex, guid, std::dec,
" mailbox=", (isMailbox ? 1 : 0)); " mailbox=", (isMailbox ? 1 : 0), " turtle=", (turtleMode ? 1 : 0));
lootTarget(guid); lootTarget(guid);
pendingGameObjectLootRetries_.push_back(PendingLootRetry{guid, 0.20f, 2}); if (turtleMode) {
pendingGameObjectLootRetries_.push_back(PendingLootRetry{guid, 0.20f, 2});
}
} }
} }