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

Fixes Pokemon::get_Nickname in angelscript.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2021-09-19 12:57:11 +02:00
parent 728bc13ac1
commit 3a5fa268dd
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Battling/Pokemon/CreatePokemon.cpp
View File

@@ -159,4 +159,10 @@ namespace PkmnLib::Battling {
_allowedExperienceGain = value;
return *this;
}
CreatePokemon& CreatePokemon::WithNickname(const std::string& nickname) {
_nickname = nickname;
return *this;
}
}

4
src/Battling/Pokemon/CreatePokemon.hpp
View File

@@ -9,7 +9,7 @@ namespace PkmnLib::Battling {
ArbUt::StringView _species = ""_cnc;
ArbUt::StringView _forme = "default"_cnc;
level_int_t _level;
std::string _nickname = "";
std::optional<std::string> _nickname = "";
ArbUt::StringView _ability = ""_cnc;
ArbUt::StringView _nature;
@@ -66,6 +66,8 @@ namespace PkmnLib::Battling {
CreatePokemon& WithNature(const ArbUt::StringView& nature);
CreatePokemon& IsAllowedExperienceGain(bool value);
CreatePokemon& WithNickname(const std::string& nickname);
Pokemon* Build() {
auto rand = ArbUt::Random();

2
src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp
View File

@@ -143,7 +143,7 @@ void RegisterPokemonClass::RegisterPokemonType(asIScriptEngine* engine) {
r = engine->RegisterObjectMethod("Pokemon", "uint32 get_CurrentHealth() const property",
asMETHOD(PkmnLib::Battling::Pokemon, GetCurrentHealth), asCALL_THISCALL);
Ensure(r >= 0);
r = engine->RegisterObjectMethod("Pokemon", "const string& get_Nickname() const property",
r = engine->RegisterObjectMethod("Pokemon", "string get_Nickname() const property",
asFUNCTION(NicknameWrapper), asCALL_CDECL_OBJFIRST);
Ensure(r >= 0);
r = engine->RegisterObjectMethod("Pokemon", "const constString& get_ActiveAbility() const property",