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

Updates CreatureLib, adds Fling Power.
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Deukhoofd 2020-02-13 11:09:24 +01:00
parent c91b1b0906
commit 2ebe63a14e
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conanfile.py
View File

@ -44,7 +44,7 @@ class PkmnLibConan(ConanFile):
self.options["AngelScript"].link_std_statically = True self.options["AngelScript"].link_std_statically = True
def requirements(self): def requirements(self):
self.requires("CreatureLib/1969f59a9ca1408b6c107d679a83f6b73aeb2af9@creaturelib/master") self.requires("CreatureLib/42050de18a9315921397d1da75b99671013203be@creaturelib/master")
if self.options.script_handler == "angelscript": if self.options.script_handler == "angelscript":
self.requires("AngelScript/2.34@AngelScript/Deukhoofd") self.requires("AngelScript/2.34@AngelScript/Deukhoofd")
else: else:

8
src/Library/Items/Item.hpp
View File

@ -4,11 +4,15 @@
#include <CreatureLib/Library/Items/Item.hpp> #include <CreatureLib/Library/Items/Item.hpp>
namespace PkmnLib::Library { namespace PkmnLib::Library {
class Item : public CreatureLib::Library::Item { class Item : public CreatureLib::Library::Item {
uint8_t _flingPower;
public: public:
Item(std::string name, CreatureLib::Library::ItemCategory category, Item(std::string name, CreatureLib::Library::ItemCategory category,
CreatureLib::Library::BattleItemCategory battleCategory, int32_t price, CreatureLib::Library::BattleItemCategory battleCategory, int32_t price,
std::unordered_set<std::string> flags) std::unordered_set<std::string> flags, uint8_t flingPower)
: CreatureLib::Library::Item(name, category, battleCategory, price, flags) {} : CreatureLib::Library::Item(name, category, battleCategory, price, flags), _flingPower(flingPower) {}
inline uint8_t GetFlingPower() const { return _flingPower; }
}; };
} }