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

Angelscript support for ConstString.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-04-07 12:04:23 +02:00
parent 1046eceacf
commit aa8915b314
12 changed files with 68 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp
View File

@@ -17,7 +17,7 @@ class testScript1 {
bool testHeldItem(Pokemon@ p, Item@ item){ return p.HeldItem is item; }
bool testCurrentHealth(Pokemon@ p, uint health){ return p.CurrentHealth == health; }
bool testNickname(Pokemon@ p, const string& name){ return p.Nickname == name; }
bool testActiveAbility(Pokemon@ p, const string &in ability){ return p.ActiveAbility == ability; }
bool testActiveAbility(Pokemon@ p, const constString &in ability){ return p.ActiveAbility == ability; }
bool testIsFainted(Pokemon@ p, bool b){ return p.IsFainted == b; }
bool testType(Pokemon@ p, uint index, uint8 type){ return p.GetTypes()[index] == type; }
bool testHasType(Pokemon@ p, uint8 type){ return p.HasType(type); }

2
tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp
View File

@@ -166,7 +166,7 @@ TEST_CASE("Validate Forme GetAbility in Script") {
auto ability = forme->GetAbility(CreatureLib::Library::TalentIndex(false, 0));
data.Context->SetArgAddress(1, &ability);
REQUIRE(data.Context->Execute() == asEXECUTION_FINISHED);
// REQUIRE((bool)data.Context->GetReturnWord());
REQUIRE((bool)data.Context->GetReturnWord());
}
#endif

2
tests/ScriptTests/ScriptTypeTests/Library/ItemDataTests.cpp
View File

@@ -7,7 +7,7 @@ static std::unordered_map<const char*, const char*> _scripts =
std::unordered_map<const char*, const char*>{{"testScript1", R"(
namespace Pokemon{
class testScript1 {
bool testName(const Item@ i, const string &in name){ return i.Name == name; }
bool testName(const Item@ i, const constString &in name){ return i.Name == name; }
bool testCategory(const Item@ i, ItemCategory category){ return i.Category == category; }
bool testBattleCategory(const Item@ i, BattleItemCategory category){ return i.BattleCategory == category; }
bool testPrice(const Item@ i, int price){ return i.Price == price; }

2
tests/ScriptTests/ScriptTypeTests/Library/MoveTests.cpp
View File

@@ -7,7 +7,7 @@ static std::unordered_map<const char*, const char*> _scripts =
std::unordered_map<const char*, const char*>{{"testScript1", R"(
namespace Pokemon{
class testScript1 {
bool testName(const MoveData@ s, const string &in name){ return s.Name == name; }
bool testName(const MoveData@ s, const constString &in name){ return s.Name == name; }
bool testType(const MoveData@ s, uint8 type){ return s.Type == type; }
bool testCategory(const MoveData@ s, MoveCategory category){ return s.Category == category; }
bool testBasePower(const MoveData@ s, uint8 basePower){ return s.BasePower == basePower; }