Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: exori gran con damage bonus #3321

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+11 −11
Open

fix: exori gran con damage bonus #3321

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57ceb16
Perf skill wheel bonus
mdbeng Feb 4, 2025
7c67668
Follow scheme of code
mdbeng Feb 4, 2025
de3182d
Merge branch 'main' into perf-skillwheel-bonus
mdbeng Feb 8, 2025
37bff68
Code format - (Clang-format)
github-actions[bot] Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions src/game/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7230,7 +7230,17 @@ bool Game::combatChangeHealth(const std::shared_ptr<Creature> &attacker, const s
if (attackerPlayer && targetPlayer && attackerPlayer->getSkull() == SKULL_BLACK && attackerPlayer->getSkullClient(targetPlayer) == SKULL_NONE) {
return false;
}


if (damage.origin != ORIGIN_NONE) {
const auto events = target->getCreatureEvents(CREATURE_EVENT_HEALTHCHANGE);
if (!events.empty()) {
for (const auto &creatureEvent : events) {
creatureEvent->executeHealthChange(target, attacker, damage);
}
damage.origin = ORIGIN_NONE;
return combatChangeHealth(attacker, target, damage);
}
}
// Wheel of destiny apply combat effects
applyWheelOfDestinyEffectsToDamage(damage, attackerPlayer, target);

Expand Down Expand Up @@ -7454,17 +7464,6 @@ bool Game::combatChangeHealth(const std::shared_ptr<Creature> &attacker, const s
return true;
}

if (damage.origin != ORIGIN_NONE) {
const auto events = target->getCreatureEvents(CREATURE_EVENT_HEALTHCHANGE);
if (!events.empty()) {
for (const auto &creatureEvent : events) {
creatureEvent->executeHealthChange(target, attacker, damage);
}
damage.origin = ORIGIN_NONE;
return combatChangeHealth(attacker, target, damage);
}
}

// Apply Custom PvP Damage (must be placed here to avoid recursive calls)
if (attackerPlayer && targetPlayer) {
applyPvPDamage(damage, attackerPlayer, targetPlayer);
Expand Down
Loading