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

Support getting distinct level attacks from LearnableAttacks.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Signed-off-by: Deukhoofd <Deukhoofd@gmail.com>
This commit is contained in:
Deukhoofd
2020-08-11 17:25:04 +02:00
parent b2931c0964
commit f3d22f7ba9
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Library/CreatureData/LearnableAttacks.cpp
View File

@@ -10,5 +10,5 @@ void LearnableAttacks::AddLevelAttack(uint8_t level, const AttackData* attack) {
levelData = {attack};
_learnedByLevel.Insert(level, levelData);
}
_distinctAttacks.insert(attack);
_distinctLevelAttacks.insert(attack);
}

14
src/Library/CreatureData/LearnableAttacks.hpp
View File

@@ -12,7 +12,7 @@ namespace CreatureLib::Library {
class LearnableAttacks {
protected:
ArbUt::Dictionary<uint8_t, ArbUt::List<const AttackData*>> _learnedByLevel;
std::unordered_set<const AttackData*> _distinctAttacks;
std::unordered_set<const AttackData*> _distinctLevelAttacks;
public:
explicit LearnableAttacks(size_t levelAttackCapacity)
@@ -20,7 +20,7 @@ namespace CreatureLib::Library {
for (auto kv : _learnedByLevel) {
for (auto attack : kv.second) {
AssertNotNull(attack)
_distinctAttacks.insert(attack);
_distinctLevelAttacks.insert(attack);
}
}
}
@@ -33,12 +33,16 @@ namespace CreatureLib::Library {
return _learnedByLevel.Get(level);
}
inline const std::unordered_set<const AttackData*>& GetDistinctLevelAttacks() const noexcept {
return _distinctLevelAttacks;
}
virtual const AttackData* GetRandomAttack(ArbUt::Random& rand) const {
if (_distinctAttacks.empty()) {
if (_distinctLevelAttacks.empty()) {
return nullptr;
}
auto val = rand.Get(_distinctAttacks.size());
auto it = _distinctAttacks.begin();
auto val = rand.Get(_distinctLevelAttacks.size());
auto it = _distinctLevelAttacks.begin();
std::advance(it, val);
return *it;
}