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

feat: display glancing and crushing blows in combat text and log

Browse source 
Add GLANCING (hitInfo 0x800) and CRUSHING (hitInfo 0x1000) as distinct
combat text types so players see mechanics feedback they expect from
Classic/TBC content:
- Glancing: shown as "~{amount}" in muted yellow/red; "glances for N" in
  the combat log
- Crushing: shown as "{amount}!" in bright orange/red; "crushes for N!"
  in the combat log
Both types are counted toward DPS meter accumulation. AttackerStateUpdateData
gains isGlancing()/isCrushing() helpers alongside the existing isCrit()/isMiss().
This commit is contained in:
Kelsi 2026-03-17 18:51:48 -07:00
parent 36fed15d43
commit 488ec945b6
4 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/game/game_handler.cpp
View file

@ -17772,7 +17772,15 @@ void GameHandler::handleAttackerStateUpdate(network::Packet& packet) {
// VICTIMSTATE_DEFLECT: Attack was deflected (e.g. shield slam reflect).
addCombatText(CombatTextEntry::DEFLECT, 0, 0, isPlayerAttacker, 0, data.attackerGuid, data.targetGuid);
} else {
auto type = data.isCrit() ? CombatTextEntry::CRIT_DAMAGE : CombatTextEntry::MELEE_DAMAGE;
CombatTextEntry::Type type;
if (data.isCrit())
type = CombatTextEntry::CRIT_DAMAGE;
else if (data.isCrushing())
type = CombatTextEntry::CRUSHING;
else if (data.isGlancing())
type = CombatTextEntry::GLANCING;
else
type = CombatTextEntry::MELEE_DAMAGE;
addCombatText(type, data.totalDamage, 0, isPlayerAttacker, 0, data.attackerGuid, data.targetGuid);
// Show partial absorb/resist from sub-damage entries
uint32_t totalAbsorbed = 0, totalResisted = 0;

28
src/ui/game_screen.cpp
View file

@ -9273,6 +9273,18 @@ void GameScreen::renderCombatText(game::GameHandler& gameHandler) {
snprintf(text, sizeof(text), "+%d Honor", entry.amount);
color = ImVec4(1.0f, 0.85f, 0.0f, alpha); // Gold for honor
break;
case game::CombatTextEntry::GLANCING:
snprintf(text, sizeof(text), "~%d", entry.amount);
color = outgoing ?
ImVec4(0.75f, 0.75f, 0.5f, alpha) : // Outgoing glancing = muted yellow
ImVec4(0.75f, 0.35f, 0.35f, alpha); // Incoming glancing = muted red
break;
case game::CombatTextEntry::CRUSHING:
snprintf(text, sizeof(text), "%d!", entry.amount);
color = outgoing ?
ImVec4(1.0f, 0.55f, 0.1f, alpha) : // Outgoing crushing = orange
ImVec4(1.0f, 0.15f, 0.15f, alpha); // Incoming crushing = bright red
break;
default:
snprintf(text, sizeof(text), "%d", entry.amount);
color = ImVec4(1.0f, 1.0f, 1.0f, alpha);
@ -9343,6 +9355,8 @@ void GameScreen::renderDPSMeter(game::GameHandler& gameHandler) {
case game::CombatTextEntry::SPELL_DAMAGE:
case game::CombatTextEntry::CRIT_DAMAGE:
case game::CombatTextEntry::PERIODIC_DAMAGE:
case game::CombatTextEntry::GLANCING:
case game::CombatTextEntry::CRUSHING:
dpsEncounterDamage_ += static_cast<float>(e.amount);
break;
case game::CombatTextEntry::HEAL:
@ -9367,6 +9381,8 @@ void GameScreen::renderDPSMeter(game::GameHandler& gameHandler) {
case game::CombatTextEntry::SPELL_DAMAGE:
case game::CombatTextEntry::CRIT_DAMAGE:
case game::CombatTextEntry::PERIODIC_DAMAGE:
case game::CombatTextEntry::GLANCING:
case game::CombatTextEntry::CRUSHING:
totalDamage += static_cast<float>(e.amount);
break;
case game::CombatTextEntry::HEAL:
@ -21218,7 +21234,7 @@ void GameScreen::renderCombatLog(game::GameHandler& gameHandler) {
using T = game::CombatTextEntry;
return t == T::MELEE_DAMAGE || t == T::SPELL_DAMAGE ||
t == T::CRIT_DAMAGE || t == T::PERIODIC_DAMAGE ||
t == T::ENVIRONMENTAL;
t == T::ENVIRONMENTAL || t == T::GLANCING || t == T::CRUSHING;
};
auto isHealType = [](game::CombatTextEntry::Type t) {
using T = game::CombatTextEntry;
@ -21492,6 +21508,16 @@ void GameScreen::renderCombatLog(game::GameHandler& gameHandler) {
snprintf(desc, sizeof(desc), "You gain %d honor", e.amount);
color = ImVec4(1.0f, 0.85f, 0.0f, 1.0f);
break;
case T::GLANCING:
snprintf(desc, sizeof(desc), "%s glances %s for %d", src, tgt, e.amount);
color = e.isPlayerSource ? ImVec4(0.75f, 0.75f, 0.5f, 1.0f)
: ImVec4(0.75f, 0.4f, 0.4f, 1.0f);
break;
case T::CRUSHING:
snprintf(desc, sizeof(desc), "%s crushes %s for %d!", src, tgt, e.amount);
color = e.isPlayerSource ? ImVec4(1.0f, 0.55f, 0.1f, 1.0f)
: ImVec4(1.0f, 0.15f, 0.15f, 1.0f);
break;
default:
snprintf(desc, sizeof(desc), "Combat event (type %d, amount %d)", (int)e.type, e.amount);
color = ImVec4(0.7f, 0.7f, 0.7f, 1.0f);