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

Cleans up HistoryHolder to be a lot less complicated (although possibly a bit slower), adds DamageHistory. 

Signed-off-by: Deukhoofd <Deukhoofd@gmail.com>
This commit is contained in:
Deukhoofd 2021-10-23 16:57:58 +02:00
parent 1ed57e51af
commit 20b53833c4
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
8 changed files with 54 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CInterface/Battling/HistoryHandler.cpp
View File

@ -4,19 +4,15 @@
using namespace CreatureLib::Battling;
export const HistoryElement* CreatureLib_HistoryHandler_GetTopElement(const HistoryHolder* p) {
return p->GetTopElement().GetRaw();
return p->GetTopElement().GetValue();
}
export const HistoryElement* CreatureLib_HistoryHandler_GetLastUsedAttack(const HistoryHolder* p) {
auto res = p->GetLastUsedAttack();
if (res.has_value()) {
return res.value();
}
return nullptr;
return p->GetLastUsedAttack().GetValue();
}
export HistoryElementKind CreatureLib_HistoryElement_GetKind(const HistoryElement* p) { return p->GetKind(); }
export const HistoryElement* CreatureLib_HistoryElement_GetPrevious(const HistoryElement* p) {
return p->GetPrevious().GetRaw();
return p->GetPrevious().GetValue();
}
export const ExecutingAttack* CreatureLib_AttackUseHistory_GetAttack(const AttackUseHistory* p) {

2
src/Battling/History/HistoryElementKind.hpp
View File

@ -1,5 +1,5 @@
#ifndef CREATURELIB_HISTORYELEMENTKIND_HPP
#define CREATURELIB_HISTORYELEMENTKIND_HPP
ENUM(HistoryElementKind, uint8_t, AttackUse)
ENUM(HistoryElementKind, uint8_t, AttackUse, Damage)
#endif // CREATURELIB_HISTORYELEMENTKIND_HPP

9
src/Battling/History/HistoryElements/AttackUseHistory.hpp
View File

@ -7,17 +7,14 @@ namespace CreatureLib::Battling {
class AttackUseHistory final : public HistoryElement {
std::unique_ptr<const ExecutingAttack> _attack;
protected:
void Clear() override {
public:
AttackUseHistory(u32 turn, const ExecutingAttack* attack) : HistoryElement(turn), _attack(attack) {}
~AttackUseHistory() {
if (_attack != nullptr) {
_attack.reset();
}
HistoryElement::Clear();
}
public:
AttackUseHistory(const ExecutingAttack* attack) : _attack(attack) {}
HistoryElementKind GetKind() const noexcept override { return HistoryElementKind::AttackUse; }
ArbUt::BorrowedPtr<const ExecutingAttack> GetAttack() const noexcept { return _attack; }
};

24
src/Battling/History/HistoryElements/DamageHistory.hpp Normal file
View File

@ -0,0 +1,24 @@
#ifndef CREATURELIB_DAMAGEHISTORY_HPP
#define CREATURELIB_DAMAGEHISTORY_HPP
#include "HistoryElement.hpp"
namespace CreatureLib::Battling {
class DamageHistory final : public HistoryElement {
ArbUt::BorrowedPtr<CreatureLib::Battling::Creature> _target;
u32 _amount;
DamageSource _source;
public:
DamageHistory(u32 turn, ArbUt::BorrowedPtr<CreatureLib::Battling::Creature> target, u32 amount,
DamageSource source)
: HistoryElement(turn), _target(target), _amount(amount), _source(source) {}
HistoryElementKind GetKind() const noexcept override { return HistoryElementKind::Damage; }
inline ArbUt::BorrowedPtr<CreatureLib::Battling::Creature> GetTarget() const noexcept { return _target; }
inline u32 GetAmount() const noexcept { return _amount; }
inline DamageSource GetDamageSource() const noexcept { return _source; }
};
}
#endif // CREATURELIB_DAMAGEHISTORY_HPP

28
src/Battling/History/HistoryElements/HistoryElement.hpp
View File

@ -5,25 +5,23 @@
namespace CreatureLib::Battling {
class HistoryElement {
friend class HistoryHolder;
u8* _previousOffset = nullptr;
protected:
virtual void Clear() {
if (_previousOffset != nullptr) {
GetPrevious()->Clear();
}
}
ArbUt::OptionalUniquePtr<HistoryElement> _previous;
u32 _turnNumber;
public:
virtual HistoryElementKind GetKind() const noexcept = 0;
ArbUt::BorrowedPtr<const HistoryElement> GetPrevious() const noexcept {
return reinterpret_cast<HistoryElement*>((u8*)this - _previousOffset);
HistoryElement(u32 turn) : _turnNumber(turn) {}
virtual ~HistoryElement() {}
[[nodiscard]] virtual HistoryElementKind GetKind() const noexcept = 0;
[[nodiscard]] ArbUt::OptionalBorrowedPtr<const HistoryElement> GetPrevious() const noexcept {
return _previous.GetValue();
}
ArbUt::BorrowedPtr<HistoryElement> GetPrevious() noexcept {
return reinterpret_cast<HistoryElement*>((u8*)this - _previousOffset);
}
ArbUt::OptionalBorrowedPtr<HistoryElement> GetPrevious() noexcept { return _previous.GetValue(); }
void SetPrevious(HistoryElement* el) noexcept { _previous = el; }
inline u32 GetTurnNumber() const noexcept { return _turnNumber; }
};
}

46
src/Battling/History/HistoryHolder.hpp
View File

@ -9,56 +9,24 @@ concept HistoryElementType = std::is_base_of<CreatureLib::Battling::HistoryEleme
namespace CreatureLib::Battling {
class HistoryHolder {
size_t _offset;
size_t _capacity;
u8* _memory = nullptr;
HistoryElement* _top = nullptr;
static constexpr size_t initialSize = 2048;
static constexpr size_t stepSize = 1024;
public:
HistoryHolder() : _offset(0), _capacity(2048) {
auto ptr = malloc(_capacity);
if (ptr == nullptr) {
THROW("Out of memory.");
}
_memory = static_cast<u8*>(ptr);
}
HistoryHolder() {}
HistoryHolder(const HistoryHolder&) = delete;
HistoryHolder& operator=(const HistoryHolder&) = delete;
~HistoryHolder() {
if (_top != nullptr)
_top->Clear();
free(_memory);
}
void Resize() {
_capacity += stepSize;
auto newPtr = realloc(_memory, _capacity);
if (newPtr == nullptr) {
THROW("Out of memory.");
}
_memory = static_cast<u8*>(newPtr);
}
virtual ~HistoryHolder() { delete _top; }
template <HistoryElementType T, class... parameters> void Register(parameters... args) {
if (_offset + sizeof(T) >= _capacity) {
Resize();
}
u8* ptr = _memory + _offset;
T* element = new (ptr) T(args...);
_offset += sizeof(T);
if (_top != nullptr) {
element->_previousOffset = (u8*)sizeof(T);
}
_top = element;
auto* prev = _top;
_top = new T(args...);
_top->SetPrevious(prev);
}
ArbUt::BorrowedPtr<const HistoryElement> GetTopElement() const noexcept { return _top; }
[[nodiscard]] ArbUt::OptionalBorrowedPtr<const HistoryElement> GetTopElement() const noexcept { return _top; }
std::optional<ArbUt::BorrowedPtr<const HistoryElement>> GetLastUsedAttack() const noexcept {
ArbUt::OptionalBorrowedPtr<const HistoryElement> GetLastUsedAttack() const noexcept {
const auto* c = _top;
while (c != nullptr) {
if (c->GetKind() == HistoryElementKind::AttackUse)

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

@ -112,7 +112,7 @@ namespace CreatureLib::Battling {
const EventHook& GetEventHook() const noexcept { return _eventHook; }
template <HistoryElementType T, class... parameters> void RegisterHistoryElement(parameters... args) {
try_creature(this->_historyHolder.Register<T>(args...);
try_creature(this->_historyHolder.Register<T>(this->GetCurrentTurn(), args...);
, "Exception occurred during history element registration.");
}
const HistoryHolder& GetHistory() const noexcept { return _historyHolder; }

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

@ -1,6 +1,7 @@
#include "Creature.hpp"
#include <utility>
#include "../EventHooks/EventDataClasses.hpp"
#include "../History/HistoryElements/DamageHistory.hpp"
#include "../Models/Battle.hpp"
#include "../ScriptHandling/ScriptMacros.hpp"
@ -176,6 +177,7 @@ namespace CreatureLib::Battling {
auto battle = this->GetBattle();
if (battle.HasValue()) {
battle.GetValue()->TriggerEventListener<DamageEvent>(this, source, _currentHealth, newHealth);
battle.GetValue()->RegisterHistoryElement<DamageHistory>(this, damage, source);
}
_currentHealth = newHealth;