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

Bugfix/Refactor: Min-Max Damage Range Calculations #7022

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+18 −14
Open

Bugfix/Refactor: Min-Max Damage Range Calculations #7022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dbdde93
Refactor and Bugfix Min-Max Damage
kphoenix137 Mar 14, 2024
46088a2
Continue refactor
kphoenix137 Mar 14, 2024
1975a58
Fix mistake
kphoenix137 Mar 14, 2024
b14455b
fix comments
kphoenix137 Mar 21, 2024
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
17 changes: 9 additions & 8 deletions Source/missiles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ void MoveMissilePos(Missile &missile)
int ProjectileMonsterDamage(Missile &missile)
{
const Monster &monster = *missile.sourceMonster();
return monster.minDamage + GenerateRnd(monster.maxDamage - monster.minDamage + 1);
return RandomIntBetween(monster.minDamage, monster.maxDamage);
}

int ProjectileTrapDamage(Missile &missile)
Expand Down Expand Up @@ -239,7 +239,7 @@ bool MonsterMHit(const Player &player, int monsterId, int mindam, int maxdam, in
if (t == MissileID::BoneSpirit) {
dam = monster.hitPoints / 3 >> 6;
} else {
dam = mindam + GenerateRnd(maxdam - mindam + 1);
dam = RandomIntBetween(mindam, maxdam);
}

if (missileData.isArrow() && damageType == DamageType::Physical) {
Expand Down Expand Up @@ -352,7 +352,7 @@ bool Plr2PlrMHit(const Player &player, Player &target, int mindam, int maxdam, i
if (mtype == MissileID::BoneSpirit) {
dam = target._pHitPoints / 3;
} else {
dam = mindam + GenerateRnd(maxdam - mindam + 1);
dam = RandomIntBetween(mindam, maxdam);
if (missileData.isArrow() && damageType == DamageType::Physical)
dam += player._pIBonusDamMod + player._pDamageMod + dam * player._pIBonusDam / 100;
if (!shift)
Expand Down Expand Up @@ -955,7 +955,7 @@ bool MonsterTrapHit(int monsterId, int mindam, int maxdam, int dist, MissileID t
}

bool resist = monster.isResistant(t, damageType);
int dam = mindam + GenerateRnd(maxdam - mindam + 1);
int dam = RandomIntBetween(mindam, maxdam);
if (!shift)
dam <<= 6;
if (resist)
Expand Down Expand Up @@ -1063,13 +1063,14 @@ bool PlayerMHit(Player &player, Monster *monster, int dist, int mind, int maxd,
dam = player._pHitPoints / 3;
} else {
if (!shift) {
dam = (mind << 6) + GenerateRnd(((maxd - mind) << 6) + 1);
// New method fixes a bug which caused the maximum possible damage value to be 63/64ths too low.
dam = RandomIntBetween(mind << 6, maxd << 6);
if (monster == nullptr)
if (HasAnyOf(player._pIFlags, ItemSpecialEffect::HalfTrapDamage))
dam /= 2;
dam += player._pIGetHit * 64;
} else {
dam = mind + GenerateRnd(maxd - mind + 1);
dam = RandomIntBetween(mind, maxd);
if (monster == nullptr)
if (HasAnyOf(player._pIFlags, ItemSpecialEffect::HalfTrapDamage))
dam /= 2;
Expand Down Expand Up @@ -2589,7 +2590,7 @@ void AddInferno(Missile &missile, AddMissileParameter &parameter)
missile._midam = 8 * i + 16 + ((8 * i + 16) / 2);
} else {
auto &monster = Monsters[missile._misource];
missile._midam = monster.minDamage + GenerateRnd(monster.maxDamage - monster.minDamage + 1);
missile._midam = RandomIntBetween(monster.minDamage, monster.maxDamage);
}
}

Expand Down Expand Up @@ -3304,7 +3305,7 @@ void ProcessLightningControl(Missile &missile)
dam = (GenerateRnd(2) + GenerateRnd(Players[missile._misource].getCharacterLevel()) + 2) << 6;
} else {
auto &monster = Monsters[missile._misource];
dam = 2 * (monster.minDamage + GenerateRnd(monster.maxDamage - monster.minDamage + 1));
dam = 2 * RandomIntBetween(monster.minDamage, monster.maxDamage);
}

SpawnLightning(missile, dam);
Expand Down
9 changes: 5 additions & 4 deletions Source/monster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ void InitMonster(Monster &monster, Direction rd, size_t typeIndex, Point positio
monster.animInfo.tickCounterOfCurrentFrame = GenerateRnd(monster.animInfo.ticksPerFrame - 1);
monster.animInfo.currentFrame = GenerateRnd(monster.animInfo.numberOfFrames - 1);

int maxhp = monster.data().hitPointsMinimum + GenerateRnd(monster.data().hitPointsMaximum - monster.data().hitPointsMinimum + 1);
int maxhp = RandomIntBetween(monster.data().hitPointsMinimum, monster.data().hitPointsMaximum);
if (monster.type().type == MT_DIABLO && !gbIsHellfire) {
maxhp /= 2;
}
Expand Down Expand Up @@ -1086,7 +1086,7 @@ void MonsterAttackMonster(Monster &attacker, Monster &target, int hper, int mind
if (hit >= hper)
return;

int dam = (mind + GenerateRnd(maxd - mind + 1)) << 6;
int dam = RandomIntBetween(mind, maxd) << 6;
ephphatha marked this conversation as resolved.
Show resolved Hide resolved
ApplyMonsterDamage(DamageType::Physical, target, dam);

if (attacker.isPlayerMinion()) {
Expand Down Expand Up @@ -1191,7 +1191,8 @@ void MonsterAttackPlayer(Monster &monster, Player &player, int hit, int minDam,
}
}
}
int dam = (minDam << 6) + GenerateRnd(((maxDam - minDam) << 6) + 1);
// New method fixes a bug which caused the maximum possible damage value to be 63/64ths too low.
int dam = RandomIntBetween(minDam << 6, maxDam << 6);
dam = std::max(dam + (player._pIGetHit << 6), 64);
if (&player == MyPlayer) {
if (player.wReflections > 0) {
Expand Down Expand Up @@ -2650,7 +2651,7 @@ void CounselorAi(Monster &monster)
if (distanceToEnemy >= 2) {
if (v < 5 * (monster.intelligence + 10) && LineClearMissile(monster.position.tile, monster.enemyPosition)) {
constexpr MissileID MissileTypes[4] = { MissileID::Firebolt, MissileID::ChargedBolt, MissileID::LightningControl, MissileID::Fireball };
StartRangedAttack(monster, MissileTypes[monster.intelligence], monster.minDamage + GenerateRnd(monster.maxDamage - monster.minDamage + 1));
StartRangedAttack(monster, MissileTypes[monster.intelligence], RandomIntBetween(monster.minDamage, monster.maxDamage));
} else if (GenerateRnd(100) < 30) {
monster.goal = MonsterGoal::Move;
monster.goalVar1 = 0;
Expand Down
6 changes: 4 additions & 2 deletions Source/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,12 +600,13 @@ bool PlrHitMonst(Player &player, Monster &monster, bool adjacentDamage = false)
}

if (gbIsHellfire && HasAllOf(player._pIFlags, ItemSpecialEffect::FireDamage | ItemSpecialEffect::LightningDamage)) {
// Fixed off by 1 error from Hellfire
int midam = RandomIntBetween(player._pIFMinDam, player._pIFMaxDam);
kphoenix137 marked this conversation as resolved.
Show resolved Hide resolved
AddMissile(player.position.tile, player.position.temp, player._pdir, MissileID::SpectralArrow, TARGET_MONSTERS, player, midam, 0);
}
int mind = player._pIMinDam;
int maxd = player._pIMaxDam;
int dam = GenerateRnd(maxd - mind + 1) + mind;
int dam = RandomIntBetween(mind, maxd);
dam += dam * player._pIBonusDam / 100;
dam += player._pIBonusDamMod;
int dam2 = dam << 6;
Expand Down Expand Up @@ -773,7 +774,7 @@ bool PlrHitPlr(Player &attacker, Player &target)

int mind = attacker._pIMinDam;
int maxd = attacker._pIMaxDam;
int dam = GenerateRnd(maxd - mind + 1) + mind;
int dam = RandomIntBetween(mind, maxd);
dam += (dam * attacker._pIBonusDam) / 100;
dam += attacker._pIBonusDamMod + attacker._pDamageMod;

Expand Down Expand Up @@ -920,6 +921,7 @@ bool DoRangeAttack(Player &player)
mistype = MissileID::LightningArrow;
}
if (HasAllOf(player._pIFlags, ItemSpecialEffect::FireArrows | ItemSpecialEffect::LightningArrows)) {
// Fixed off by 1 error from Hellfire
dmg = RandomIntBetween(player._pIFMinDam, player._pIFMaxDam);
mistype = MissileID::SpectralArrow;
}
Expand Down
Loading