Skip to content

fix: mana drain on analyzer #3473

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

Merged
dudantas merged 3 commits into from
Apr 23, 2025
Merged

fix: mana drain on analyzer #3473

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce25e57
fix: mana drain on analyzer
dudantas Mar 29, 2025
1e05de8
fix: spec
dudantas Mar 29, 2025
4cd48e5
Merge branch 'main' into dudantas/fix-manadrain-analyzer
dudantas Apr 23, 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
21 changes: 18 additions & 3 deletions src/game/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7895,6 +7895,7 @@ int32_t Game::calculateLeechAmount(const int32_t &realDamage, const uint16_t &sk
bool Game::combatChangeMana(const std::shared_ptr<Creature> &attacker, const std::shared_ptr<Creature> &target, CombatDamage &damage) {
const Position &targetPos = target->getPosition();
auto manaChange = damage.primary.value + damage.secondary.value;
auto spectators = Spectators().find<Player>(targetPos);
if (manaChange > 0) {
std::shared_ptr<Player> attackerPlayer;
if (attacker) {
Expand Down Expand Up @@ -7946,7 +7947,7 @@ bool Game::combatChangeMana(const std::shared_ptr<Creature> &attacker, const std
message.primary.value = realManaChange;
message.primary.color = TEXTCOLOR_MAYABLUE;

for (const auto &spectator : Spectators().find<Player>(targetPos)) {
for (const auto &spectator : spectators) {
const auto &tmpPlayer = spectator->getPlayer();
if (!tmpPlayer) {
continue;
Expand Down Expand Up @@ -8043,7 +8044,7 @@ bool Game::combatChangeMana(const std::shared_ptr<Creature> &attacker, const std
message.primary.value = manaLoss;
message.primary.color = TEXTCOLOR_BLUE;

for (const auto &spectator : Spectators().find<Player>(targetPos)) {
for (const auto &spectator : spectators) {
const auto &tmpPlayer = spectator->getPlayer();
if (!tmpPlayer) {
continue;
Expand All @@ -8056,7 +8057,7 @@ bool Game::combatChangeMana(const std::shared_ptr<Creature> &attacker, const std
message.text = ss.str();
} else if (tmpPlayer == targetPlayer) {
ss.str({});
ss << "You lose " << damageString << " mana";
ss << "You lose " << damageString << "";
if (!attacker) {
ss << '.';
} else if (targetPlayer == attackerPlayer) {
Expand Down Expand Up @@ -8086,6 +8087,20 @@ bool Game::combatChangeMana(const std::shared_ptr<Creature> &attacker, const std
}
tmpPlayer->sendTextMessage(message);
}

if (targetPlayer) {
std::string cause = "(other)";
if (attacker) {
cause = attacker->getName();
}

targetPlayer->updateInputAnalyzer(damage.primary.type, -damage.primary.value, cause);
if (attackerPlayer) {
if (damage.secondary.type != COMBAT_NONE) {
attackerPlayer->updateInputAnalyzer(damage.secondary.type, -damage.secondary.value, cause);
}
}
}
}

return true;
Expand Down
Loading