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

Update to latest CreatureLib
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2022-05-14 16:50:20 +02:00
parent 50c58a9fd3
commit cf34563a56
22 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Battling/Battle/Battle.cpp
View File

@@ -6,18 +6,18 @@ bool PkmnLib::Battling::Battle::SetWeather(const ArbUt::StringView& name) {
if (blockWeather) {
return false;
}
if (_weatherScript != nullptr) {
_weatherScript->OnRemove();
if (_weatherScript.HasValue()) {
_weatherScript.GetValue()->OnRemove();
}
_weatherScript = std::unique_ptr<CreatureLib::Battling::BattleScript>(
_library->LoadScript(this, static_cast<ScriptCategory>(PkmnScriptCategory::Weather), name));
_weatherScript =
_library->LoadScript(this, static_cast<ScriptCategory>(PkmnScriptCategory::Weather), name).TakeOwnership();
_eventHook.Trigger<WeatherChangeEvent>(name);
return true;
}
void PkmnLib::Battling::Battle::ClearWeather() {
if (_weatherScript == nullptr)
if (!_weatherScript.HasValue())
return;
_weatherScript->OnRemove();
_weatherScript.GetValue()->OnRemove();
_weatherScript = nullptr;
_eventHook.Trigger<WeatherChangeEvent>(""_cnc);
}
@@ -65,8 +65,8 @@ PkmnLib::Battling::Battle* PkmnLib::Battling::Battle::Clone() const {
battle->_battleResult = _battleResult;
battle->_currentTurn = _currentTurn;
_volatile.Clone(battle, battle->_volatile);
if (_weatherScript != nullptr) {
battle->_weatherScript = std::unique_ptr<CreatureLib::Battling::BattleScript>(_weatherScript->Clone(battle));
if (_weatherScript.HasValue()) {
battle->_weatherScript = _weatherScript.GetValue()->Clone(battle);
}
return battle;

15
src/Battling/Battle/Battle.hpp
View File

@@ -10,7 +10,7 @@
namespace PkmnLib::Battling {
class Battle : public CreatureLib::Battling::Battle {
private:
std::unique_ptr<CreatureLib::Battling::BattleScript> _weatherScript = nullptr;
ArbUt::OptionalUniquePtr<CreatureLib::Battling::BattleScript> _weatherScript = nullptr;
public:
Battle(const BattleLibrary* non_null library,
@@ -26,20 +26,21 @@ namespace PkmnLib::Battling {
bool SetWeather(const ArbUt::StringView& name);
void ClearWeather();
void SuppressWeather() {
if (_weatherScript != nullptr) {
_weatherScript->Suppress();
if (_weatherScript.HasValue()) {
_weatherScript.GetValue()->Suppress();
}
}
void UnsuppressWeather() {
if (_weatherScript != nullptr) {
_weatherScript->Unsuppress();
if (_weatherScript.HasValue()) {
_weatherScript.GetValue()->Unsuppress();
}
}
const ArbUt::StringView& GetWeatherName() noexcept {
if (_weatherScript == nullptr)
if (!_weatherScript.HasValue()) {
return ArbUt::StringView::EmptyString();
return _weatherScript->GetName();
}
return _weatherScript.GetValue()->GetName();
}
size_t ScriptCount() const override { return CreatureLib::Battling::Battle::ScriptCount() + 1; }