Used ClangFormat style guide I'm happy with.
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -4,37 +4,36 @@
|
||||
#include "../../GenericTemplates.cpp"
|
||||
#include "../../Library/CreatureData/CreatureSpecies.hpp"
|
||||
#include "../../Library/Items/Item.hpp"
|
||||
#include "LearnedAttack.hpp"
|
||||
#include "DamageSource.hpp"
|
||||
#include "../ScriptHandling/ScriptSet.hpp"
|
||||
#include "../ScriptHandling/ScriptAggregator.hpp"
|
||||
#include "../ScriptHandling/ScriptSet.hpp"
|
||||
#include "../ScriptHandling/ScriptSource.hpp"
|
||||
#include "DamageSource.hpp"
|
||||
#include "LearnedAttack.hpp"
|
||||
|
||||
namespace CreatureLib::Battling{
|
||||
namespace CreatureLib::Battling {
|
||||
// Forward declare battle class
|
||||
class Battle;
|
||||
class BattleSide;
|
||||
class BattleLibrary;
|
||||
|
||||
class Creature : public ScriptSource{
|
||||
class Creature : public ScriptSource {
|
||||
GetProperty(const Library::CreatureSpecies*, Species);
|
||||
GetProperty(const Library::SpeciesVariant*, Variant)
|
||||
GetProperty(const Library::SpeciesVariant*, Variant);
|
||||
|
||||
GetProperty(uint8_t, Level);
|
||||
GetProperty(uint32_t, Experience);
|
||||
GetProperty(Core::StatisticSet<uint8_t >, StatExperience);
|
||||
GetProperty(Core::StatisticSet<uint8_t >, StatPotential);
|
||||
GetProperty(Core::StatisticSet<uint8_t>, StatExperience);
|
||||
GetProperty(Core::StatisticSet<uint8_t>, StatPotential);
|
||||
GetProperty(uint32_t, UniqueIdentifier);
|
||||
GetProperty(Library::Gender, Gender);
|
||||
GetProperty(uint8_t, Coloring);
|
||||
GetProperty(const Library::Item*, HeldItem);
|
||||
GetProperty(uint32_t, CurrentHealth);
|
||||
|
||||
|
||||
private:
|
||||
Core::StatisticSet<int8_t > _statBoost;
|
||||
Core::StatisticSet<uint32_t > _flatStats;
|
||||
Core::StatisticSet<uint32_t > _boostedStats;
|
||||
Core::StatisticSet<int8_t> _statBoost;
|
||||
Core::StatisticSet<uint32_t> _flatStats;
|
||||
Core::StatisticSet<uint32_t> _boostedStats;
|
||||
|
||||
Battle* _battle;
|
||||
BattleSide* _side;
|
||||
@@ -54,9 +53,9 @@ namespace CreatureLib::Battling{
|
||||
|
||||
public:
|
||||
Creature(const Library::CreatureSpecies* species, const Library::SpeciesVariant* variant, uint8_t level,
|
||||
uint32_t experience, Core::StatisticSet<uint8_t > statExp, Core::StatisticSet<uint8_t > statPotential,
|
||||
uint32_t uid, Library::Gender gender, uint8_t coloring, const Library::Item* heldItem, std::string nickname,
|
||||
int8_t talent, std::vector<LearnedAttack*> attacks);
|
||||
uint32_t experience, Core::StatisticSet<uint8_t> statExp, Core::StatisticSet<uint8_t> statPotential,
|
||||
uint32_t uid, Library::Gender gender, uint8_t coloring, const Library::Item* heldItem,
|
||||
std::string nickname, int8_t talent, std::vector<LearnedAttack*> attacks);
|
||||
|
||||
virtual ~Creature() = default;
|
||||
|
||||
@@ -75,10 +74,9 @@ namespace CreatureLib::Battling{
|
||||
void Damage(uint32_t damage, DamageSource source);
|
||||
void OverrideActiveTalent(const std::string& talent);
|
||||
|
||||
void GetActiveScripts(std::vector<ScriptWrapper>& scripts) override;
|
||||
|
||||
void GetActiveScripts(std::vector<ScriptWrapper> &scripts) override;
|
||||
|
||||
//region Stat APIs
|
||||
// region Stat APIs
|
||||
|
||||
void SetBattle(Battle* battle);
|
||||
void SetBattleLibrary(BattleLibrary* library);
|
||||
@@ -95,11 +93,8 @@ namespace CreatureLib::Battling{
|
||||
void RecalculateFlatStat(Core::Statistic);
|
||||
void RecalculateBoostedStat(Core::Statistic);
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
// endregion
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
#endif //CREATURELIB_CREATURE_HPP
|
||||
#endif // CREATURELIB_CREATURE_HPP
|
||||
|
||||
Reference in New Issue
Block a user