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

change weapon for ranged skills

Browse source 
Signed-off-by: Pavel Okhlopkov <pavel.okhlopkov@flant.com>
This commit is contained in:
Pavel Okhlopkov 2026-04-10 23:01:16 +03:00
parent fe1dc5e02b
commit 6ba0edc2fb
6 changed files with 176 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/game/combat_handler.cpp
View file

@ -206,14 +206,21 @@ void CombatHandler::startAutoAttack(uint64_t targetGuid) {
owner_.dismount();
}
// Client-side melee range gate to avoid starting "swing forever" loops when
// Client-side range gate to avoid starting "swing forever" loops when
// target is already clearly out of range.
if (auto target = owner_.getEntityManager().getEntity(targetGuid)) {
float dx = owner_.movementInfoRef().x - target->getLatestX();
float dy = owner_.movementInfoRef().y - target->getLatestY();
float dz = owner_.movementInfoRef().z - target->getLatestZ();
float dist3d = std::sqrt(dx * dx + dy * dy + dz * dz);
if (dist3d > 8.0f) {
// Use longer range limit when a ranged weapon is equipped
const auto& rangedSlot = owner_.getInventory().getEquipSlot(game::EquipSlot::RANGED);
bool hasRangedWeapon = !rangedSlot.empty() &&
(rangedSlot.item.inventoryType == game::InvType::RANGED_BOW ||
rangedSlot.item.inventoryType == game::InvType::RANGED_GUN ||
rangedSlot.item.inventoryType == game::InvType::THROWN);
float maxRange = hasRangedWeapon ? 40.0f : 8.0f;
if (dist3d > maxRange) {
if (autoAttackRangeWarnCooldown_ <= 0.0f) {
owner_.addSystemChatMessage("Target is too far away.");
autoAttackRangeWarnCooldown_ = 1.25f;
@ -443,7 +450,14 @@ void CombatHandler::handleAttackerStateUpdate(network::Packet& packet) {
lastMeleeSwingMs_ = static_cast<uint64_t>(
std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::system_clock::now().time_since_epoch()).count());
if (owner_.meleeSwingCallbackRef()) owner_.meleeSwingCallbackRef()(0);
// Skip melee animation if a ranged shot was just triggered from
// SMSG_SPELL_GO (Auto Shot / Shoot / Throw). The ranged animation
// is already playing; firing the melee callback here would override it.
if (owner_.consumeSuppressMeleeSwingAnim()) {
LOG_DEBUG("Suppressed melee swing anim — ranged shot already triggered");
} else {
if (owner_.meleeSwingCallbackRef()) owner_.meleeSwingCallbackRef()(0);
}
}
if (!isPlayerAttacker && owner_.npcSwingCallbackRef()) {
owner_.npcSwingCallbackRef()(data.attackerGuid);

10
src/game/spell_handler.cpp
View file

@ -1025,8 +1025,16 @@ void SpellHandler::handleSpellGo(network::Packet& packet) {
if (!owner_.isProfessionSpell(data.spellId))
playSpellCastSound(data.spellId);
// Instant melee abilities → trigger attack animation
// Ranged auto-attack spells (Auto Shot, Shoot, Throw) complete as timed
// casts and are NOT classified as instant melee abilities, so trigger the
// ranged shot animation explicitly here.
uint32_t sid = data.spellId;
if (sid == 75 || sid == 5019 || sid == 2764) {
if (owner_.meleeSwingCallbackRef()) owner_.meleeSwingCallbackRef()(sid);
owner_.suppressNextMeleeSwingAnim();
}
// Instant melee abilities → trigger attack animation
bool isMeleeAbility = false;
if (!owner_.isProfessionSpell(sid)) {
owner_.loadSpellNameCache();