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

Initial work on battling
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Deukhoofd
2019-10-17 14:33:25 +02:00
parent 212a7d1ad6
commit d580d81163
21 changed files with 302 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Library/CreateCreature.hpp
View File

@@ -13,19 +13,19 @@ namespace CreatureLib::Library {
uint8_t _level;
std::string _nickname = "";
uint32_t _healthPotential = 0;
uint32_t _physAttackPotential = 0;
uint32_t _physDefensePotential = 0;
uint32_t _magAttackPotential = 0;
uint32_t _magDefensePotential = 0;
uint32_t _speedPotential = 0;
uint8_t _healthPotential = 0;
uint8_t _physAttackPotential = 0;
uint8_t _physDefensePotential = 0;
uint8_t _magAttackPotential = 0;
uint8_t _magDefensePotential = 0;
uint8_t _speedPotential = 0;
uint32_t _healthExperience = 0;
uint32_t _physAttackExperience = 0;
uint32_t _physDefenseExperience = 0;
uint32_t _magAttackExperience = 0;
uint32_t _magDefenseExperience = 0;
uint32_t _speedExperience = 0;
uint8_t _healthExperience = 0;
uint8_t _physAttackExperience = 0;
uint8_t _physDefenseExperience = 0;
uint8_t _magAttackExperience = 0;
uint8_t _magDefenseExperience = 0;
uint8_t _speedExperience = 0;
std::string _talent = "";
Gender _gender = static_cast<Gender>(-1);

18
src/Library/Creature.cpp
View File

@@ -4,8 +4,8 @@ CreatureLib::Library::Creature::Creature(const CreatureLib::Library::DataLibrary
const CreatureLib::Library::CreatureSpecies *species,
const CreatureLib::Library::SpeciesVariant *variant, uint8_t level,
std::string nickname, int8_t talentIndex,
CreatureLib::Core::StatisticSet statExperience,
CreatureLib::Core::StatisticSet statPotential,
CreatureLib::Core::StatisticSet<uint8_t > statExperience,
CreatureLib::Core::StatisticSet<uint8_t > statPotential,
uint32_t identifier, CreatureLib::Library::Gender gender, uint8_t coloring,
const CreatureLib::Library::Item *heldItem)
:
@@ -52,8 +52,20 @@ int32_t CalculateStat(const CreatureLib::Library::Creature* creature, CreatureLi
}
int32_t CreatureLib::Library::Creature::CalculateFullStat(CreatureLib::Core::Statistic stat) const {
uint32_t CreatureLib::Library::Creature::CalculateFullStat(CreatureLib::Core::Statistic stat) const {
if (stat == Core::Statistic::Health)
return CalculateHealth(this);
return CalculateStat(this, stat);
}
uint16_t CreatureLib::Library::Creature::GetBaseStat(CreatureLib::Core::Statistic stat) const {
return this->GetVariant()->GetStatistic(stat);
}
uint8_t CreatureLib::Library::Creature::GetStatPotential(CreatureLib::Core::Statistic stat) const {
return this->__StatPotential.GetStat(stat);
}
uint8_t CreatureLib::Library::Creature::GetStatExperience(CreatureLib::Core::Statistic stat) const {
return this->__StatExperience.GetStat(stat);
}

13
src/Library/Creature.hpp
View File

@@ -13,8 +13,8 @@ namespace CreatureLib::Library{
GetProperty(const SpeciesVariant*, Variant);
GetProperty(uint8_t, Level);
GetProperty(uint32_t, Experience);
GetProperty(Core::StatisticSet, StatExperience);
GetProperty(Core::StatisticSet, StatPotential);
GetProperty(Core::StatisticSet<uint8_t >, StatExperience);
GetProperty(Core::StatisticSet<uint8_t >, StatPotential);
GetProperty(uint32_t, UniqueIdentifier);
GetProperty(Gender, Gender);
GetProperty(uint8_t, Coloring);
@@ -26,15 +26,18 @@ namespace CreatureLib::Library{
int8_t _talentIndex;
public:
Creature(const DataLibrary* library, const CreatureSpecies* species, const SpeciesVariant* variant,
uint8_t level, std::string nickname, int8_t talentIndex, Core::StatisticSet statExperience,
Core::StatisticSet statPotential, uint32_t identifier, Gender gender,
uint8_t level, std::string nickname, int8_t talentIndex, Core::StatisticSet<uint8_t > statExperience,
Core::StatisticSet<uint8_t > statPotential, uint32_t identifier, Gender gender,
uint8_t coloring, const Item* heldItem);
virtual ~Creature(){}
std::string GetTalent() const;
std::string GetNickname() const;
virtual int32_t CalculateFullStat(Core::Statistic stat) const;
virtual uint32_t CalculateFullStat(Core::Statistic stat) const;
virtual uint16_t GetBaseStat(Core::Statistic stat) const;
virtual uint8_t GetStatPotential(Core::Statistic stat) const;
virtual uint8_t GetStatExperience(Core::Statistic stat) const;
};
}

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

@@ -44,7 +44,7 @@ int8_t CreatureLib::Library::SpeciesVariant::GetRandomTalent(CreatureLib::Core::
CreatureLib::Library::SpeciesVariant::SpeciesVariant(std::string name, float height, float weight,
uint32_t baseExperience, std::vector<std::string> types,
CreatureLib::Core::StatisticSet baseStats,
CreatureLib::Core::StatisticSet<uint16_t > baseStats,
std::vector<std::string> talents,
std::vector<std::string> secretTalents)
: __Name(name),

4
src/Library/CreatureData/SpeciesVariant.hpp
View File

@@ -19,13 +19,13 @@ namespace CreatureLib::Library {
GetProperty(uint32_t, BaseExperience);
private:
std::vector<std::string> _types;
const Core::StatisticSet _baseStatistics;
const Core::StatisticSet<uint16_t > _baseStatistics;
std::vector<std::string> _talents;
std::vector<std::string> _secretTalents;
//CreatureMoves _moves;
public:
SpeciesVariant(std::string name, float height, float weight, uint32_t baseExperience,
std::vector<std::string> types, Core::StatisticSet baseStats, std::vector<std::string> talents,
std::vector<std::string> types, Core::StatisticSet<uint16_t > baseStats, std::vector<std::string> talents,
std::vector<std::string> secretTalents);
[[nodiscard]] size_t GetTypeCount() const;