Deukhoofd/PkmnLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for turning off the random damage modifier.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2021-08-24 20:57:45 +02:00
parent dfcdfd8343
commit 7fe7c8becf
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Battling/Library/DamageLibrary.cpp
View File

@@ -83,8 +83,10 @@ float PkmnLib::Battling::DamageLibrary::GetDamageModifier(CreatureLib::Battling:
mod *= critModifier;
}
Ensure(attack->GetUser()->GetBattle().GetValue());
float randPercentage = 85 + attack->GetUser()->GetBattle().GetValue()->GetRandom()->Get(0, 16);
mod *= randPercentage / 100.0;
if (_hasRandomness) {
float randPercentage = 85 + attack->GetUser()->GetBattle().GetValue()->GetRandom()->Get(0, 16);
mod *= randPercentage / 100.0;
}
if (attack->GetUser()->HasType(hitData.GetType())) {
float stabModifier = 1.5;
PKMN_HOOK(OverrideSTABModifier, attack, attack, target, hitIndex, &stabModifier);

4
src/Battling/Library/DamageLibrary.hpp
View File

@@ -4,7 +4,11 @@
#include <CreatureLib/Battling/Library/DamageLibrary.hpp>
namespace PkmnLib::Battling {
class DamageLibrary final : public CreatureLib::Battling::DamageLibrary {
bool _hasRandomness;
public:
explicit DamageLibrary(bool hasRandomness = true) : _hasRandomness(hasRandomness) {}
uint32_t GetDamage(CreatureLib::Battling::ExecutingAttack* attack, CreatureLib::Battling::Creature* target,
uint8_t hitIndex,
const CreatureLib::Battling::ExecutingAttack::HitData& hitData) const override;