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

Compare commits

base: Deukhoofd:fe6d13eb7e1741b79ab314e09cf39626556b9b1a
Branches Tags
Deukhoofd:master
...
compare: Deukhoofd:master
Branches Tags
Deukhoofd:master

4 Commits
fe6d13eb7e ... master

Author SHA1 Message Date
Deukhoofd
0b4806b354 Fixes Windows not reading files properly. 2022-03-18 00:38:38 +01:00
Deukhoofd
fd24ce63c1 Adds battle effect for items 2022-02-19 15:08:28 +01:00
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
5 changed files with 70 additions and 8 deletions
Expand all files Collapse all files

7
BuildAbilities.cpp
View File

@@ -1,6 +1,6 @@
#include "BuildAbilities.hpp"
#include "json.hpp"
#include <fstream>
#include "json.hpp"
using json = nlohmann::json;
@@ -51,6 +51,11 @@ CreatureLib::Library::TalentLibrary* BuildAbilities::Build(const std::string& pa
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;
}
}

43
BuildItems.cpp
View File

@@ -83,6 +83,12 @@ 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;
}
}
@@ -91,9 +97,44 @@ PkmnLib::Library::ItemLibrary* BuildItems::Build(const std::string& path) {
100, ArbUt::StringView(effectName.get<std::string>().c_str()), parameters);
}
CreatureLib::Library::SecondaryEffect* battleEffect = nullptr;
auto& battleEffectJson = val["battleEffect"];
if (battleEffectJson != nullptr) {
auto& effectName = battleEffectJson["name"];
auto& parametersJson = battleEffectJson["parameters"];
ArbUt::List<CreatureLib::Library::EffectParameter*> parameters;
if (parametersJson != nullptr) {
for (auto& kv : parametersJson.items()) {
auto& p = kv.value();
auto t = p.type();
switch (t) {
case json::value_t::boolean:
parameters.Append(new CreatureLib::Library::EffectParameter(p.get<bool>()));
break;
case json::value_t::number_integer:
case json::value_t::number_unsigned:
parameters.Append(new CreatureLib::Library::EffectParameter(p.get<int64_t>()));
break;
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;
}
}
}
battleEffect = new CreatureLib::Library::SecondaryEffect(
100, ArbUt::StringView(effectName.get<std::string>().c_str()), parameters);
}
auto item = new PkmnLib::Library::Item(ArbUt::StringView(_name.get<std::string>().c_str()), itemType,
CreatureLib::Library::BattleItemCategory::None, _price.get<int32_t>(),
effect, flags, _flingPower.get<uint8_t>());
effect, battleEffect, flags, _flingPower.get<uint8_t>());
lib->Insert(item->GetName(), item);
}
return lib;

12
BuildLibrary.cpp
View File

@@ -95,7 +95,17 @@ BattleLibrary* BuildLibrary::Build(const std::string& pathString,
continue;
std::ifstream in(dirEntry.path());
std::string contents((std::istreambuf_iterator<char>(in)), std::istreambuf_iterator<char>());
asScriptResolver->CreateScript((const char*)dirEntry.path().c_str(), contents.c_str());
const auto* p = dirEntry.path().c_str();
// Windows defines paths as widechars, so we need to convert it to a normal human const char*
#if WINDOWS
std::mbstate_t state = std::mbstate_t();
int textLen = 1 + std::wcsrtombs(NULL, &p, 0, &state);
std::vector<char> storeTextBuffer(textLen);
std::wcsrtombs(&storeTextBuffer[0], &p, textLen, &state);
asScriptResolver->CreateScript(&storeTextBuffer[0], contents.c_str());
#else
asScriptResolver->CreateScript(p, contents.c_str());
#endif
}
asScriptResolver->FinalizeModule();
ScriptsTimeMs =

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;
}
}

4
BuildSpecies.cpp
View File

@@ -135,7 +135,7 @@ const PkmnLib::Library::PokemonForme* BuildSpecies::BuildForme(const std::string
auto s = ab.value().get<std::string>();
auto tryAbility = talentLibrary->TryGet(ArbUt::StringView(s.c_str(), s.length()));
if (!tryAbility.has_value())
THROW("Unknown ability " << s);
THROW("Unknown ability ", s);
abilities.Append(tryAbility.value());
}
@@ -144,7 +144,7 @@ const PkmnLib::Library::PokemonForme* BuildSpecies::BuildForme(const std::string
auto s = ab.value().get<std::string>();
auto tryAbility = talentLibrary->TryGet(ArbUt::StringView(s.c_str(), s.length()));
if (!tryAbility.has_value())
THROW("Unknown ability " << s);
THROW("Unknown ability ", s);
hiddenAbilities.Append(tryAbility.value());
}