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

Jump to bottom

fix: critical hit damage calculation #1913

Merged
merged 1 commit into from
Nov 25, 2023
Merged

fix: critical hit damage calculation #1913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions src/creatures/combat/combat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2024,13 +2024,12 @@ void Combat::applyExtensions(std::shared_ptr<Creature> caster, std::shared_ptr<C

// Critical hit
uint16_t chance = 0;
int32_t multiplier = 50;
int32_t bonus = 50;
auto player = caster->getPlayer();
auto monster = caster->getMonster();
if (player) {
chance = player->getSkillLevel(SKILL_CRITICAL_HIT_CHANCE);
multiplier = player->getSkillLevel(SKILL_CRITICAL_HIT_DAMAGE);

bonus = player->getSkillLevel(SKILL_CRITICAL_HIT_DAMAGE);
if (target) {
uint16_t playerCharmRaceid = player->parseRacebyCharm(CHARM_LOW, false, 0);
if (playerCharmRaceid != 0) {
Expand All @@ -2048,8 +2047,8 @@ void Combat::applyExtensions(std::shared_ptr<Creature> caster, std::shared_ptr<C
chance = monster->critChance();
}

multiplier += damage.criticalDamage;
multiplier = 1 + multiplier / 100;
bonus += damage.criticalDamage;
double multiplier = 1.0 + static_cast<double>(bonus) / 100;
chance += (uint16_t)damage.criticalChance;

if (chance != 0 && uniform_random(1, 100) <= chance) {
Expand Down
20 changes: 11 additions & 9 deletions src/game/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6625,10 +6625,8 @@ bool Game::combatChangeHealth(std::shared_ptr<Creature> attacker, std::shared_pt
}
}

std::string attackMsg = fmt::format("{} attack", damage.critical ? "critical " : " ");
std::stringstream ss;
ss << (damage.critical ? "critical " : " ") << "attack";
std::string attackMsg = ss.str();
ss.str({});

if (target->hasCondition(CONDITION_MANASHIELD) && damage.primary.type != COMBAT_UNDEFINEDDAMAGE) {
int32_t manaDamage = std::min<int32_t>(target->getMana(), healthChange);
Expand Down Expand Up @@ -6915,17 +6913,19 @@ void Game::buildMessageAsSpectator(
) const {
if (spectatorMessage.empty()) {
ss.str({});
auto attackMsg = damage.critical ? "critical " : "";
auto article = damage.critical ? "a" : "an";
ss << ucfirst(target->getNameDescription()) << " loses " << damageString;
if (attacker) {
ss << " due to ";
if (attacker == target) {
if (targetPlayer) {
ss << targetPlayer->getPossessivePronoun() << " own attack";
ss << targetPlayer->getPossessivePronoun() << " own " << attackMsg << "attack";
} else {
ss << "its own attack";
ss << "its own " << attackMsg << "attack";
}
} else {
ss << "an attack by " << attacker->getNameDescription();
ss << article << " " << attackMsg << "attack by " << attacker->getNameDescription();
}
}
ss << '.';
Expand All @@ -6945,13 +6945,15 @@ void Game::buildMessageAsTarget(
const std::string &damageString
) const {
ss.str({});
auto attackMsg = damage.critical ? "critical " : "";
auto article = damage.critical ? "a" : "an";
ss << "You lose " << damageString;
if (!attacker) {
ss << '.';
} else if (targetPlayer == attackerPlayer) {
ss << " due to your own attack.";
ss << " due to your own " << attackMsg << "attack.";
} else {
ss << " due to an attack by " << attacker->getNameDescription() << '.';
ss << " due to " << article << " " << attackMsg << "attack by " << attacker->getNameDescription() << '.';
}
if (damage.extension) {
ss << " " << damage.exString;
Expand All @@ -6965,7 +6967,7 @@ void Game::buildMessageAsAttacker(
std::stringstream &ss, const std::string &damageString
) const {
ss.str({});
ss << ucfirst(target->getNameDescription()) << " loses " << damageString << " due to your attack.";
ss << ucfirst(target->getNameDescription()) << " loses " << damageString << " due to your " << (damage.critical ? "critical " : " ") << "attack.";
if (damage.extension) {
ss << " " << damage.exString;
}
Expand Down
Loading