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

Include string value effect parameters

This commit is contained in:
Deukhoofd 2022-02-12 19:15:42 +01:00
parent e2edf6129d
commit efca5ca06d
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BuildAbilities.cpp
View File

@ -1,6 +1,6 @@
#include "BuildAbilities.hpp" #include "BuildAbilities.hpp"
#include "json.hpp"
#include <fstream> #include <fstream>
#include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;
@ -51,6 +51,11 @@ CreatureLib::Library::TalentLibrary* BuildAbilities::Build(const std::string& pa
case json::value_t::number_float: case json::value_t::number_float:
realParameters.Append(new CreatureLib::Library::EffectParameter(p.get<float>())); realParameters.Append(new CreatureLib::Library::EffectParameter(p.get<float>()));
break; break;
case json::value_t ::string: {
auto s = p.get<std::string>();
realParameters.Append(new CreatureLib::Library::EffectParameter(ArbUt::StringView(s.c_str(), s.length())));
break;
}
default: continue; default: continue;
} }
} }

5
BuildItems.cpp
View File

@ -83,6 +83,11 @@ PkmnLib::Library::ItemLibrary* BuildItems::Build(const std::string& path) {
case json::value_t::number_float: case json::value_t::number_float:
parameters.Append(new CreatureLib::Library::EffectParameter(p.get<float>())); parameters.Append(new CreatureLib::Library::EffectParameter(p.get<float>()));
break; break;
case json::value_t ::string: {
auto s = p.get<std::string>();
parameters.Append(new CreatureLib::Library::EffectParameter(ArbUt::StringView(s.c_str(), s.length())));
break;
}
default: continue; default: continue;
} }
} }

10
BuildMoves.cpp
View File

@ -8,8 +8,8 @@ using json = nlohmann::json;
auto& _##objectKey = o[#objectKey]; \ auto& _##objectKey = o[#objectKey]; \
if (_##objectKey.is_null()) { \ if (_##objectKey.is_null()) { \
auto errorKeyFunc = [=]() { return key; }; \ auto errorKeyFunc = [=]() { return key; }; \
std::cout << "Failed to retrieve key '" << #objectKey << "' for object with key '" << errorKeyFunc() \ std::cout << "Failed to retrieve key '" << #objectKey << "' for object with key '" << errorKeyFunc() << path \
<< path << "'\n"; \ << "'\n"; \
return nullptr; \ return nullptr; \
} }
@ -89,6 +89,12 @@ PkmnLib::Library::MoveLibrary* BuildMoves::Build(const std::string& path,
case json::value_t::number_float: case json::value_t::number_float:
parameters.Append(new CreatureLib::Library::EffectParameter(p.get<float>())); parameters.Append(new CreatureLib::Library::EffectParameter(p.get<float>()));
break; break;
case json::value_t ::string: {
auto s = p.get<std::string>();
parameters.Append(new CreatureLib::Library::EffectParameter(
ArbUt::StringView(s.c_str(), s.length())));
break;
}
default: continue; default: continue;
} }
} }