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

Compare commits

base: Deukhoofd:85b80f4be7595b6644203756a9574ee62de735e3
Branches Tags
Deukhoofd:master
...
compare: Deukhoofd:efca5ca06d1bf2ede55397e2a4576985089996c2
Branches Tags
Deukhoofd:master

6 Commits
85b80f4be7 ... efca5ca06d

Author SHA1 Message Date
Deukhoofd
efca5ca06d Include string value effect parameters 2022-02-12 19:15:42 +01:00
Deukhoofd
e2edf6129d Update to new Throw message. 2021-11-21 12:42:35 +01:00
Deukhoofd
fe6d13eb7e Include fstream in BuildAbilities.cpp for Windows 2021-11-20 10:05:16 +01:00
Deukhoofd
045e863fc3 Fix for abilities using the wrong json.hpp 2021-11-20 09:57:10 +01:00
Deukhoofd
125db3bc5c Update for pkmnlib reworks 2021-11-20 09:55:09 +01:00
Deukhoofd
d3e95dad61 Change separator detection on csv parsing. 2021-09-07 18:55:36 +02:00
9 changed files with 133 additions and 20 deletions
Expand all files Collapse all files

68
BuildAbilities.cpp Normal file
View File

@@ -0,0 +1,68 @@
#include "BuildAbilities.hpp"
#include <fstream>
#include "json.hpp"
using json = nlohmann::json;
#define GET(o, objectKey, key) \
auto& _##objectKey = o[#objectKey]; \
if (_##objectKey.is_null()) { \
auto errorKeyFunc = [=]() { return key; }; \
std::cout << "Failed to retrieve key '" << #objectKey << "' for object with key '" << errorKeyFunc() << path \
<< "'\n"; \
return nullptr; \
}
CreatureLib::Library::TalentLibrary* BuildAbilities::Build(const std::string& path) {
std::ifstream fileStream(path.c_str());
if (fileStream.fail()) {
std::cout << "Failed to load Abilities data file at '" << path << "'\n";
return nullptr;
}
auto lib = new CreatureLib::Library::TalentLibrary();
json j;
fileStream >> j;
for (const auto& i : j.items()) {
if (i.key().starts_with("$")) {
continue;
}
auto& val = i.value();
auto _effect = val["effect"];
auto _parameters = val["parameters"];
ArbUt::StringView effectName = ""_cnc;
if (!_effect.empty()) {
effectName = ArbUt::StringView(_effect.get<std::string>().c_str(), _effect.get<std::string>().length());
}
ArbUt::List<CreatureLib::Library::EffectParameter*> realParameters;
if (!_parameters.empty()) {
for (auto& kv : _parameters.items()) {
auto& p = kv.value();
auto t = p.type();
switch (t) {
case json::value_t::boolean:
realParameters.Append(new CreatureLib::Library::EffectParameter(p.get<bool>()));
break;
case json::value_t::number_integer:
case json::value_t::number_unsigned:
realParameters.Append(new CreatureLib::Library::EffectParameter(p.get<int64_t>()));
break;
case json::value_t::number_float:
realParameters.Append(new CreatureLib::Library::EffectParameter(p.get<float>()));
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;
}
}
}
auto key = ArbUt::StringView(i.key().c_str(), i.key().length());
lib->Insert(key, new CreatureLib::Library::Talent(key, effectName, realParameters));
}
return lib;
}

11
BuildAbilities.hpp Normal file
View File

@@ -0,0 +1,11 @@
#ifndef PKMNLIB_AI_BUILDABILITIES_HPP
#define PKMNLIB_AI_BUILDABILITIES_HPP
#include <CreatureLib/Library/TalentLibrary.hpp>
class BuildAbilities {
public:
static CreatureLib::Library::TalentLibrary* Build(const std::string& path);
};
#endif // PKMNLIB_AI_BUILDABILITIES_HPP

5
BuildItems.cpp
View File

@@ -83,6 +83,11 @@ PkmnLib::Library::ItemLibrary* BuildItems::Build(const std::string& path) {
case json::value_t::number_float:
parameters.Append(new CreatureLib::Library::EffectParameter(p.get<float>()));
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;
}
}

14
BuildLibrary.cpp
View File

@@ -1,11 +1,13 @@
#include "BuildLibrary.hpp"
#include <PkmnLib/ScriptResolving/AngelScript/AngelScriptResolver.hpp>
#include "BuildAbilities.hpp"
using namespace PkmnLib::Battling;
size_t TypeTimeMs;
size_t NaturesTimeMs;
size_t MovesTimeMs;
size_t AbilitiesTimeMs;
size_t SpeciesTimeMs;
size_t ItemsTimeMs;
size_t GrowthRateTimeMs;
@@ -40,9 +42,12 @@ BattleLibrary* BuildLibrary::Build(const std::string& pathString,
MovesTimeMs =
std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - begin).count();
begin = std::chrono::steady_clock::now();
auto* talentsLibraries = BuildAbilities::Build((path / "Abilities.json").generic_string());
AbilitiesTimeMs =
std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - begin).count();
auto* speciesLibrary =
BuildSpecies::BuildLibrary((path / "Pokemon.json").generic_string(), typesLibrary, movesLibrary);
auto* speciesLibrary = BuildSpecies::BuildLibrary((path / "Pokemon.json").generic_string(), typesLibrary,
talentsLibraries, movesLibrary);
SpeciesTimeMs =
std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - begin).count();
begin = std::chrono::steady_clock::now();
@@ -64,8 +69,9 @@ BattleLibrary* BuildLibrary::Build(const std::string& pathString,
}
auto settings = new PkmnLib::Library::LibrarySettings(100, 4, 4096);
auto staticLibrary = new PkmnLib::Library::PokemonLibrary(settings, speciesLibrary, movesLibrary, itemsLibrary,
growthRates, typesLibrary, natureLibrary);
auto staticLibrary =
new PkmnLib::Library::PokemonLibrary(settings, speciesLibrary, movesLibrary, itemsLibrary, growthRates,
typesLibrary, talentsLibraries, natureLibrary);
begin = std::chrono::steady_clock::now();
auto scriptResolver = BattleLibrary::CreateScriptResolver();

12
BuildMoves.cpp
View File

@@ -5,11 +5,11 @@
using json = nlohmann::json;
#define GET(o, objectKey, key) \
auto& _##objectKey = o[#objectKey]; \
auto& _##objectKey = o[#objectKey]; \
if (_##objectKey.is_null()) { \
auto errorKeyFunc = [=]() { return key; }; \
std::cout << "Failed to retrieve key '" << #objectKey << "' for object with key '" << errorKeyFunc() \
<< path << "'\n"; \
std::cout << "Failed to retrieve key '" << #objectKey << "' for object with key '" << errorKeyFunc() << path \
<< "'\n"; \
return nullptr; \
}
@@ -89,6 +89,12 @@ PkmnLib::Library::MoveLibrary* BuildMoves::Build(const std::string& path,
case json::value_t::number_float:
parameters.Append(new CreatureLib::Library::EffectParameter(p.get<float>()));
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;
}
}

12
BuildNatures.cpp
View File

@@ -20,6 +20,8 @@ static CreatureLib::Library::Statistic ParseStatistic(const std::string& stat) {
return static_cast<CreatureLib::Library::Statistic>(254);
}
const char PossibleSeparators[] = {',', ';', '|', '\t', ':'};
PkmnLib::Library::NatureLibrary* BuildNatures::Build(const std::string& path) {
std::ifstream file(path);
if (file.fail()) {
@@ -33,11 +35,13 @@ PkmnLib::Library::NatureLibrary* BuildNatures::Build(const std::string& path) {
return nullptr;
}
auto divider = ',';
if (strncmp(line.c_str(), "sep=", 4) == 0) {
divider = line[4];
std::getline(file, line);
for (const auto& s : PossibleSeparators) {
if (line.find(s) != std::string::npos) {
divider = s;
break;
}
}
auto library = new PkmnLib::Library::NatureLibrary();
auto* library = new PkmnLib::Library::NatureLibrary();
std::string substr;
while (std::getline(file, line)) {
size_t lastStart = 0;

20
BuildSpecies.cpp
View File

@@ -13,6 +13,7 @@
PkmnLib::Library::SpeciesLibrary* BuildSpecies::BuildLibrary(const std::string& path,
const CreatureLib::Library::TypeLibrary* types,
const CreatureLib::Library::TalentLibrary* talentLibrary,
const PkmnLib::Library::MoveLibrary* moveLibrary) {
std::ifstream fileStream(path.c_str());
if (fileStream.fail()) {
@@ -50,7 +51,7 @@ PkmnLib::Library::SpeciesLibrary* BuildSpecies::BuildLibrary(const std::string&
auto& defaultForme = _formes["default"];
if (!defaultForme.is_null()) {
auto forme = BuildForme("default", defaultForme, it.key(), path, types, moveLibrary);
auto forme = BuildForme("default", defaultForme, it.key(), path, types, talentLibrary, moveLibrary);
species = new PkmnLib::Library::PokemonSpecies(
_id.get<uint16_t>(), ArbUt::StringView(_species.get<std::string>().c_str()), forme,
_genderRatio.get<int8_t>() / static_cast<float>(100),
@@ -62,7 +63,7 @@ PkmnLib::Library::SpeciesLibrary* BuildSpecies::BuildLibrary(const std::string&
if (formeIt.key() == "default") {
continue;
}
auto forme = BuildForme(formeIt.key(), formeIt.value(), it.key(), path, types, moveLibrary);
auto forme = BuildForme(formeIt.key(), formeIt.value(), it.key(), path, types, talentLibrary, moveLibrary);
if (forme == nullptr)
return nullptr;
if (species == nullptr) {
@@ -110,6 +111,7 @@ inline void BuildLevelMove(const json& levelMoveObj, const PkmnLib::Library::Mov
const PkmnLib::Library::PokemonForme* BuildSpecies::BuildForme(const std::string& name, const json& forme,
const std::string& baseKeyName, const std::string& path,
const CreatureLib::Library::TypeLibrary* typeLibrary,
const CreatureLib::Library::TalentLibrary* talentLibrary,
const PkmnLib::Library::MoveLibrary* moveLibrary) {
GET(forme, abilities, baseKeyName + " -> " + name);
GET(forme, hiddenAbilities, baseKeyName + " -> " + name);
@@ -128,16 +130,22 @@ const PkmnLib::Library::PokemonForme* BuildSpecies::BuildForme(const std::string
}
auto stats = ParseStatistics(_baseStats);
auto abilities = ArbUt::List<ArbUt::StringView>(_abilities.size());
auto abilities = ArbUt::List<ArbUt::BorrowedPtr<const CreatureLib::Library::Talent>>(_abilities.size());
for (const auto& ab : _abilities.items()) {
auto s = ab.value().get<std::string>();
abilities.Append(ArbUt::StringView(s.c_str(), s.length()));
auto tryAbility = talentLibrary->TryGet(ArbUt::StringView(s.c_str(), s.length()));
if (!tryAbility.has_value())
THROW("Unknown ability ", s);
abilities.Append(tryAbility.value());
}
auto hiddenAbilities = ArbUt::List<ArbUt::StringView>(_hiddenAbilities.size());
auto hiddenAbilities = ArbUt::List<ArbUt::BorrowedPtr<const CreatureLib::Library::Talent>>(_hiddenAbilities.size());
for (const auto& ab : _hiddenAbilities.items()) {
auto s = ab.value().get<std::string>();
hiddenAbilities.Append(ArbUt::StringView(s.c_str(), s.length()));
auto tryAbility = talentLibrary->TryGet(ArbUt::StringView(s.c_str(), s.length()));
if (!tryAbility.has_value())
THROW("Unknown ability ", s);
hiddenAbilities.Append(tryAbility.value());
}
auto moves = new PkmnLib::Library::LearnableMoves(100);

2
BuildSpecies.hpp
View File

@@ -11,11 +11,13 @@ class BuildSpecies {
static const PkmnLib::Library::PokemonForme* BuildForme(const std::string& name, const json& forme,
const std::string& baseKeyName, const std::string& path,
const CreatureLib::Library::TypeLibrary* typeLibrary,
const CreatureLib::Library::TalentLibrary* talentLibrary,
const PkmnLib::Library::MoveLibrary* moveLibrary);
public:
static PkmnLib::Library::SpeciesLibrary* BuildLibrary(const std::string& path,
const CreatureLib::Library::TypeLibrary* types,
const CreatureLib::Library::TalentLibrary* talentLibrary,
const PkmnLib::Library::MoveLibrary* moveLibrary);
};

9
BuildTypes.cpp
View File

@@ -1,4 +1,5 @@
#include "BuildTypes.hpp"
const char PossibleSeparators[] = {',', ';', '|', '\t', ':'};
CreatureLib::Library::TypeLibrary* BuildTypes::Build(const std::string& path) {
std::ifstream file(path);
@@ -13,9 +14,11 @@ CreatureLib::Library::TypeLibrary* BuildTypes::Build(const std::string& path) {
return nullptr;
}
auto divider = ',';
if (strncmp(line.c_str(), "sep=", 4) == 0) {
divider = line[4];
std::getline(file, line);
for (const auto& s :PossibleSeparators) {
if (line.find(s) != std::string::npos){
divider = s;
break;
}
}
auto* library = new CreatureLib::Library::TypeLibrary();