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

Style fixes
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2022-06-07 23:23:40 +02:00
parent e4b818c799
commit a05a9ac76d
33 changed files with 120 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CInterface/Battling/Battle.cpp
View File

@@ -3,14 +3,16 @@
using namespace PkmnLib::Battling;
export_func uint8_t PkmnLib_Battle_Construct(Battle*& out, const BattleLibrary* library,
CreatureLib::Battling::BattleParty* const* parties, size_t partiesCount,
bool canFlee, uint8_t numberOfSides, uint8_t creaturesPerSide,
uint_fast32_t randomSeed) {
CreatureLib::Battling::BattleParty* const* parties, size_t partiesCount,
bool canFlee, uint8_t numberOfSides, uint8_t creaturesPerSide,
uint_fast32_t randomSeed) {
ArbUt::List<CreatureLib::Battling::BattleParty*> partiesList(parties, parties + partiesCount);
Try(out = new Battle(library, partiesList, canFlee, numberOfSides, creaturesPerSide, randomSeed));
}
export_func void PkmnLib_Battle_Destruct(Battle* p) { p->~Battle(); }
export_func uint8_t PkmnLib_Battle_SetWeather(Battle* p, const char* name) { Try(p->SetWeather(ArbUt::StringView(name))); };
export_func uint8_t PkmnLib_Battle_SetWeather(Battle* p, const char* name) {
Try(p->SetWeather(ArbUt::StringView(name)));
};
export_func uint8_t PkmnLib_Battle_ClearWeather(Battle* p) { Try(p->ClearWeather()); };
export_func const char* PkmnLib_Battle_GetWeatherName(Battle* p) { return p->GetWeatherName().c_str(); }

8
CInterface/Battling/BattleLibrary.cpp
View File

@@ -3,10 +3,10 @@
using namespace PkmnLib::Battling;
export_func uint8_t PkmnLib_BattleLibrary_Construct(BattleLibrary*& out, PkmnLib::Library::PokemonLibrary* staticLib,
StatCalculator* statCalculator, DamageLibrary* damageLibrary,
ExperienceLibrary* experienceLibrary,
PkmnLib::Battling::ScriptResolver* scriptResolver,
MiscLibrary* miscLibrary, CaptureLibrary* captureLibrary) {
StatCalculator* statCalculator, DamageLibrary* damageLibrary,
ExperienceLibrary* experienceLibrary,
PkmnLib::Battling::ScriptResolver* scriptResolver,
MiscLibrary* miscLibrary, CaptureLibrary* captureLibrary) {
Try(out = new BattleLibrary(staticLib, statCalculator, damageLibrary, experienceLibrary, scriptResolver,
miscLibrary, captureLibrary));
}

6
CInterface/Battling/ExperienceLibrary.cpp
View File

@@ -5,9 +5,9 @@ using namespace PkmnLib::Battling;
export_func ExperienceLibrary* PkmnLib_ExperienceLibrary_Construct() { return new ExperienceLibrary(); }
export_func uint8_t PkmnLib_ExperienceLibrary_HandleExperienceGain(ExperienceLibrary* p,
CreatureLib::Battling::Creature* faintedMon,
CreatureLib::Battling::Creature* const* opponents,
size_t numberOfOpponents) {
CreatureLib::Battling::Creature* faintedMon,
CreatureLib::Battling::Creature* const* opponents,
size_t numberOfOpponents) {
Try(p->HandleExperienceGain(faintedMon, std::unordered_set<ArbUt::BorrowedPtr<CreatureLib::Battling::Creature>>(
opponents, opponents + numberOfOpponents));)
}

4
CInterface/Battling/MiscLibrary.cpp
View File

@@ -9,7 +9,7 @@ export_func MiscLibrary* PkmnLib_MiscLibrary_Construct(PkmnLib::Library::TimeOfD
export_func void PkmnLib_MiscLibrary_Destruct(MiscLibrary* p) { delete p; }
export_func u8 PkmnLib_MiscLibrary_CanEvolveFromLevelUp(bool& out, MiscLibrary* p,
const PkmnLib::Library::EvolutionData* evoData,
const Pokemon* pokemon) {
const PkmnLib::Library::EvolutionData* evoData,
const Pokemon* pokemon) {
Try(out = p->CanEvolveFromLevelUp(evoData, pokemon))
}

10
CInterface/Battling/PkmnScript.cpp
View File

@@ -5,14 +5,14 @@
using namespace PkmnLib::Battling;
export_func uint8_t PkmnLib_PkmnScript_ModifyCriticalStage(PkmnScript* script,
CreatureLib::Battling::ExecutingAttack* attack,
CreatureLib::Battling::Creature* target, uint8_t hit,
uint8_t* critStage) {
CreatureLib::Battling::ExecutingAttack* attack,
CreatureLib::Battling::Creature* target, uint8_t hit,
uint8_t* critStage) {
Try(script->ModifyCriticalStage(attack, target, hit, critStage);)
}
export_func u8 PkmnLib_EvolutionScript_DoesEvolveFromLevelUp(EvolutionScript* script,
const PkmnLib::Library::EvolutionData* evoData,
const Pokemon* pokemon, bool* out) {
const PkmnLib::Library::EvolutionData* evoData,
const Pokemon* pokemon, bool* out) {
Try(script->DoesEvolveFromLevelUp(evoData, pokemon, out));
}

19
CInterface/Battling/Pokemon.cpp
View File

@@ -2,15 +2,14 @@
#include "../Core.hpp"
using namespace PkmnLib::Battling;
export_func uint8_t
PkmnLib_Pokemon_Construct(Pokemon*& out, const BattleLibrary* library, const PkmnLib::Library::PokemonSpecies* species,
const PkmnLib::Library::PokemonForme* forme, uint8_t level, uint32_t experience, uint32_t uid,
CreatureLib::Library::Gender gender, uint8_t coloring, const PkmnLib::Library::Item* heldItem,
const char* nickname, bool hiddenAbility, uint8_t abilityIndex,
CreatureLib::Battling::LearnedAttack* const* moves, size_t moveCount, uint8_t hpIv,
uint8_t attIv, uint8_t defIv, uint8_t sAtIv, uint8_t sDeIv, uint8_t spIv, uint8_t hpEv,
uint8_t attEv, uint8_t defEv, uint8_t sAtEv, uint8_t sDeEv, uint8_t spEv,
const PkmnLib::Library::Nature* nature, bool allowedExperienceGain, bool isEgg) {
export_func uint8_t PkmnLib_Pokemon_Construct(
Pokemon*& out, const BattleLibrary* library, const PkmnLib::Library::PokemonSpecies* species,
const PkmnLib::Library::PokemonForme* forme, uint8_t level, uint32_t experience, uint32_t uid,
CreatureLib::Library::Gender gender, uint8_t coloring, const PkmnLib::Library::Item* heldItem, const char* nickname,
bool hiddenAbility, uint8_t abilityIndex, CreatureLib::Battling::LearnedAttack* const* moves, size_t moveCount,
uint8_t hpIv, uint8_t attIv, uint8_t defIv, uint8_t sAtIv, uint8_t sDeIv, uint8_t spIv, uint8_t hpEv, uint8_t attEv,
uint8_t defEv, uint8_t sAtEv, uint8_t sDeEv, uint8_t spEv, const PkmnLib::Library::Nature* nature,
bool allowedExperienceGain, bool isEgg) {
Try({
if (nickname == nullptr) {
nickname = "";
@@ -54,7 +53,7 @@ SIMPLE_GET_FUNC(Pokemon, IsEgg, bool)
export_func void PkmnLib_Pokemon_SetIsEgg(Pokemon* p, bool value) { p->SetIsEgg(value); }
export_func u8 PkmnLib_Pokemon_Evolve(Pokemon* p, const PkmnLib::Library::PokemonSpecies* species,
const PkmnLib::Library::PokemonForme* forme) {
const PkmnLib::Library::PokemonForme* forme) {
Try(p->Evolve(species, forme);)
}