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

Added canRevive parameter to Heal function, added Faint event.

Browse Source
This commit is contained in:
Deukhoofd
2020-03-09 16:29:41 +01:00
parent 3efd7a6974
commit 06336c64cd
5 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Battling/Models/Creature.cpp
View File

@@ -88,6 +88,9 @@ bool Battling::Creature::IsFainted() const { return this->_currentHealth <= 0; }
void Battling::Creature::OnFaint() {
// HOOK: On Faint
if (_battle != nullptr) {
_battle->TriggerEventListener(new FaintEvent(this));
}
_library->GetExperienceLibrary()->HandleExperienceGain(this, _seenOpponents);
if (!_battle->CanSlotBeFilled(_side->GetSideIndex(), _side->GetCreatureIndex(this))) {
@@ -113,7 +116,10 @@ void Battling::Creature::Damage(uint32_t damage, Battling::DamageSource source)
}
}
void Battling::Creature::Heal(uint32_t amount) {
void Battling::Creature::Heal(uint32_t amount, bool canRevive) {
if (_currentHealth == 0 && !canRevive) {
return;
}
if (amount > GetMaxHealth() - _currentHealth) {
amount = GetMaxHealth() - _currentHealth;
}

2
src/Battling/Models/Creature.hpp
View File

@@ -111,7 +111,7 @@ namespace CreatureLib::Battling {
uint32_t GetMaxHealth() const { return _boostedStats.GetHealth(); }
void ChangeLevelBy(int8_t amount);
void Damage(uint32_t damage, DamageSource source);
void Heal(uint32_t amount);
void Heal(uint32_t amount, bool canRevive = false);
void OverrideActiveTalent(const ConstString& talent);
void AddExperience(uint32_t amount);