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

Compare commits

base: Deukhoofd:0.0.11
Branches Tags
Deukhoofd:master
Deukhoofd:0.0.18 Deukhoofd:0.0.17 Deukhoofd:0.0.16 Deukhoofd:0.0.15 Deukhoofd:0.0.14 Deukhoofd:0.0.13 Deukhoofd:0.0.12 Deukhoofd:0.0.11 Deukhoofd:0.0.10 Deukhoofd:0.0.9 Deukhoofd:0.0.8 Deukhoofd:0.0.7 Deukhoofd:0.0.6 Deukhoofd:0.0.5 Deukhoofd:0.0.4 Deukhoofd:0.0.3 Deukhoofd:0.0.2.1 Deukhoofd:0.0.2 Deukhoofd:0.0.1
..
compare: Deukhoofd:0.0.12
Branches Tags
Deukhoofd:master
Deukhoofd:0.0.18 Deukhoofd:0.0.17 Deukhoofd:0.0.16 Deukhoofd:0.0.15 Deukhoofd:0.0.14 Deukhoofd:0.0.13 Deukhoofd:0.0.12 Deukhoofd:0.0.11 Deukhoofd:0.0.10 Deukhoofd:0.0.9 Deukhoofd:0.0.8 Deukhoofd:0.0.7 Deukhoofd:0.0.6 Deukhoofd:0.0.5 Deukhoofd:0.0.4 Deukhoofd:0.0.3 Deukhoofd:0.0.2.1 Deukhoofd:0.0.2 Deukhoofd:0.0.1

2 Commits
0.0.11 ... 0.0.12

Author SHA1 Message Date
Deukhoofd
8e5f196d37 Update BuildData
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details
2021-11-21 12:42:42 +01:00
Deukhoofd
9685037cf3 Update to new Throw message. 2021-11-21 12:42:35 +01:00
3 changed files with 5 additions and 4 deletions
Expand all files Collapse all files

2
src/BuildData

Submodule src/BuildData updated: fe6d13eb7e...e2edf6129d

2
src/Tester/AngelScript/BattleFunctions.hpp
View File

@@ -155,7 +155,7 @@ class BattleFunctions {
static void LearnMove(PkmnLib::Battling::Pokemon* user, const ArbUt::StringView& moveName) { static void LearnMove(PkmnLib::Battling::Pokemon* user, const ArbUt::StringView& moveName) {
auto move = Globals::Library.GetValue()->GetMoveLibrary()->TryGet(moveName); auto move = Globals::Library.GetValue()->GetMoveLibrary()->TryGet(moveName);
if (!move.has_value()) { if (!move.has_value()) {
THROW("Unknown move: " << moveName); THROW("Unknown move: ", moveName);
} }
user->AddAttack( user->AddAttack(
new PkmnLib::Battling::LearnedMove(move.value(), CreatureLib::Battling::AttackLearnMethod::Unknown)); new PkmnLib::Battling::LearnedMove(move.value(), CreatureLib::Battling::AttackLearnMethod::Unknown));

5
src/Tester/AngelScript/MiscMockFunctions.hpp
View File

@@ -5,7 +5,8 @@
class MiscMockFunctions { class MiscMockFunctions {
static CScriptHandle CreateMoveScript(const ArbUt::StringView& name) { static CScriptHandle CreateMoveScript(const ArbUt::StringView& name) {
auto script = Globals::Library.GetValue()->GetScriptResolver()->LoadScript(nullptr, ScriptCategory::Attack, name); auto script =
Globals::Library.GetValue()->GetScriptResolver()->LoadScript(nullptr, ScriptCategory::Attack, name);
if (script != nullptr) { if (script != nullptr) {
auto* ctx = asGetActiveContext(); auto* ctx = asGetActiveContext();
TestEnvironment* env = static_cast<TestEnvironment*>(ctx->GetUserData(684)); TestEnvironment* env = static_cast<TestEnvironment*>(ctx->GetUserData(684));
@@ -25,7 +26,7 @@ class MiscMockFunctions {
auto move = Globals::Library.GetValue()->GetMoveLibrary()->TryGet(moveName); auto move = Globals::Library.GetValue()->GetMoveLibrary()->TryGet(moveName);
if (!move.has_value()) { if (!move.has_value()) {
THROW("Unknown move: " << moveName); THROW("Unknown move: ", moveName);
} }
auto learnedMove = auto learnedMove =
new PkmnLib::Battling::LearnedMove(move.value(), CreatureLib::Battling::AttackLearnMethod::Unknown); new PkmnLib::Battling::LearnedMove(move.value(), CreatureLib::Battling::AttackLearnMethod::Unknown);