diff --git a/conanfile.py b/conanfile.py index d326948..21fe1fe 100644 --- a/conanfile.py +++ b/conanfile.py @@ -44,7 +44,7 @@ class PkmnLibConan(ConanFile): self.options["AngelScript"].link_std_statically = True def requirements(self): - self.requires("CreatureLib/252be18630a42289bbd093dc0823668f545360f7@creaturelib/master") + self.requires("CreatureLib/579ee82f02d6eedb5d924c8b4b056bfdb561ef53@creaturelib/master") if self.options.script_handler == "angelscript": self.requires("AngelScript/2.34@AngelScript/Deukhoofd") else: diff --git a/src/Battling/Library/DamageLibrary.cpp b/src/Battling/Library/DamageLibrary.cpp index ccd684c..d2d7ff5 100644 --- a/src/Battling/Library/DamageLibrary.cpp +++ b/src/Battling/Library/DamageLibrary.cpp @@ -3,7 +3,7 @@ int PkmnLib::Battling::DamageLibrary::GetDamage(CreatureLib::Battling::ExecutingAttack* attack, CreatureLib::Battling::Creature* target, uint8_t hitIndex) const { auto levelMod = static_cast(2 * attack->GetUser()->GetLevel()); - auto hit = attack->GetAttackDataForTarget(target).GetHit(hitIndex); + auto hit = attack->GetAttackDataForTarget(target)->GetHit(hitIndex); auto bp = hit->GetBasePower(); auto statMod = GetStatModifier(attack, target, hitIndex); // HOOK: Modify stat modifier @@ -23,7 +23,7 @@ float PkmnLib::Battling::DamageLibrary::GetStatModifier(CreatureLib::Battling::E uint8_t hitIndex) const { auto user = attack->GetUser(); // HOOK: allow overriding for which users stat we use. - auto hit = attack->GetAttackDataForTarget(target).GetHit(hitIndex); + auto hit = attack->GetAttackDataForTarget(target)->GetHit(hitIndex); CreatureLib::Core::Statistic offensiveStat; CreatureLib::Core::Statistic defensiveStat; auto learnedMove = dynamic_cast(attack->GetAttack()); @@ -61,7 +61,7 @@ float PkmnLib::Battling::DamageLibrary::GetDamageModifier(CreatureLib::Battling: CreatureLib::Battling::Creature* target, uint8_t hitIndex) const { float mod = 1; - auto hit = attack->GetAttackDataForTarget(target).GetHit(hitIndex); + auto hit = attack->GetAttackDataForTarget(target)->GetHit(hitIndex); mod *= hit->GetEffectiveness(); // HOOK: Modify damage modifier. return mod;