Adds support for modifying volatile scripts after adding them.

src/ScriptResolving/AngelScript/AngelScriptFunctionCall.hpp

@@ -31,6 +31,7 @@ public:
                 } else {
                     ctx->PopState();
                 }
+                printf("%s\n", err.str().c_str());
                 throw ArbUt::Exception(err.str());
             }
             if (newContext) {

src/ScriptResolving/AngelScript/AngelScriptResolver.cpp

@@ -32,6 +32,9 @@ static void TranslateException(asIScriptContext* ctx, void* /*userParam*/) {
     try {
         // Retrow the original exception so we can catch it again
         throw;
+    } catch (ArbUt::Exception& e) {
+        // Tell the VM the type of exception that occurred
+        ctx->SetException(e.what());
     }catch (std::exception& e) {
         // Tell the VM the type of exception that occurred
         ctx->SetException(e.what());

src/ScriptResolving/AngelScript/AngelScriptResolver.hpp

@@ -84,7 +84,10 @@ public:
         asITypeInfo* t;
         auto v = _baseTypes.TryGet(name);
         if (!v.has_value()) {
-            t = this->_engine->GetTypeInfoByDecl(name.c_str());
+            t = _mainModule->GetTypeInfoByName(name.c_str());
+            if (t == NULL){
+                t = _engine->GetTypeInfoByDecl(name.c_str());
+            }
             _baseTypes.Insert(name, t);
         } else {
             t = v.value();

src/ScriptResolving/AngelScript/AngelScriptScript.hpp

@@ -25,6 +25,8 @@ public:
 
     ~AngelScriptScript() override { _obj->Release(); }
 
+    inline asIScriptObject* GetRawAngelscriptObject() const noexcept { return _obj; }
+
     [[nodiscard]] const ArbUt::StringView& GetName() const noexcept override { return _type->GetName(); }
     const AngelScriptTypeInfo* GetType() const noexcept { return _type; }
 

src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterBattleClass.cpp

@@ -2,6 +2,7 @@
 #include <CreatureLib/Battling/Models/Battle.hpp>
 #include <CreatureLib/Battling/Models/BattleSide.hpp>
 #include "../../../../Battling/Battle/Battle.hpp"
+#include "../../AngelScriptScript.hpp"
 #include "../HelperFile.hpp"
 
 void RegisterBattleClass::Register(asIScriptEngine* engine) {
@@ -50,6 +51,11 @@ CreatureLib::Battling::BattleSide* GetBattleSideWrapper(PkmnLib::Battling::Battl
     return battle->GetSides()[index];
 }
 
+static asIScriptObject* AddVolatileWrapper(PkmnLib::Battling::Battle* obj, const ArbUt::StringView& name) {
+    auto* scriptObject = (AngelScriptScript*)obj->AddVolatileScript(name);
+    return scriptObject->GetRawAngelscriptObject();
+}
+
 void RegisterBattleClass::RegisterBattleSide(asIScriptEngine* engine) {
     int r = engine->RegisterObjectMethod(
         "BattleSide", "bool SwapPositions(uint8 a, uint8 b)",
@@ -81,9 +87,8 @@ void RegisterBattleClass::RegisterBattle(asIScriptEngine* engine) {
     r = engine->RegisterObjectMethod("Battle", "ChoiceQueue@ get_TurnQueue() const property",
                                      asFUNCTION(GetCurrentTurnQueueWrapper), asCALL_CDECL_OBJFIRST);
     Ensure(r >= 0);
-    r = engine->RegisterObjectMethod(
-        "Battle", "void AddVolatile(const constString &in name) const",
-        asMETHODPR(PkmnLib::Battling::Battle, AddVolatileScript, (const ArbUt::StringView&), void), asCALL_THISCALL);
+    r = engine->RegisterObjectMethod("Battle", "ref@ AddVolatile(const constString &in name) const",
+                                     asFUNCTION(AddVolatileWrapper), asCALL_CDECL_OBJFIRST);
     Ensure(r >= 0);
     r = engine->RegisterObjectMethod(
         "Battle", "void RemoveVolatile(const constString &in name) const",

src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp

@@ -1,8 +1,11 @@
 #include "RegisterPokemonClass.hpp"
 #include <CreatureLib/Battling/Models/LearnedAttack.hpp>
 #include "../../../../../extern/angelscript_addons/scriptarray/scriptarray.h"
+#include "../../../../../extern/angelscript_addons/scripthandle/scripthandle.h"
 #include "../../../../Battling/PkmnDamageSource.hpp"
 #include "../../../../Battling/Pokemon/Pokemon.hpp"
+#include "../../AngelScriptResolver.hpp"
+#include "../../AngelScriptScript.hpp"
 #include "../HelperFile.hpp"
 
 // Hack to handle AngelScript not recognizing different sized enums on fields, and returning invalid values due to it.
@@ -87,6 +90,15 @@ OPTIONAL_BORROWED_PTR_GETTER_FUNC(PkmnLib::Battling::Pokemon, const CreatureLib:
 OPTIONAL_BORROWED_PTR_GETTER_FUNC(PkmnLib::Battling::Pokemon, CreatureLib::Battling::Battle, GetBattle);
 OPTIONAL_BORROWED_PTR_GETTER_FUNC(PkmnLib::Battling::Pokemon, CreatureLib::Battling::BattleSide, GetBattleSide);
 
+static CScriptHandle AddVolatileWrapper(PkmnLib::Battling::Pokemon* obj, const ArbUt::StringView& name) {
+    auto handle = CScriptHandle();
+    auto *resolver = static_cast<AngelScriptResolver*>(obj->GetLibrary()->GetScriptResolver().get());
+    auto script = static_cast<AngelScriptScript*>(obj->AddVolatileScript(name))->GetRawAngelscriptObject();
+    script->AddRef();
+    handle.Set(script, resolver->GetBaseType("PkmnScript"));
+    return handle;
+}
+
 void RegisterPokemonClass::RegisterPokemonType(asIScriptEngine* engine) {
     [[maybe_unused]] int r = engine->RegisterObjectType("Pokemon", 0, asOBJ_REF | asOBJ_NOCOUNT);
     Ensure(r >= 0);
@@ -177,9 +189,8 @@ void RegisterPokemonClass::RegisterPokemonType(asIScriptEngine* engine) {
     r = engine->RegisterObjectMethod("Pokemon", "int8 GetStatBoost(Statistic stat) const",
                                      asMETHOD(PkmnLib::Battling::Pokemon, GetStatBoost), asCALL_THISCALL);
     Ensure(r >= 0);
-    r = engine->RegisterObjectMethod(
-        "Pokemon", "void AddVolatile(const constString &in name) const",
-        asMETHODPR(PkmnLib::Battling::Pokemon, AddVolatileScript, (const ArbUt::StringView&), void), asCALL_THISCALL);
+    r = engine->RegisterObjectMethod("Pokemon", "ref@ AddVolatile(const constString &in name)",
+                                     asFUNCTION(AddVolatileWrapper), asCALL_CDECL_OBJFIRST);
     Ensure(r >= 0);
     r = engine->RegisterObjectMethod(
         "Pokemon", "void RemoveVolatile(const constString &in name) const",

tests/ScriptTests/BaseScriptClassTests.cpp

@@ -5,7 +5,7 @@
 #include "../TestLibrary/TestLibrary.hpp"
 
 #define AS_CLASS(name, contents)                                                                                       \
-    { #name, "namespace Pokemon{ [Pokemon effect=" #name "] class " #name " : PkmnScript { " contents "}}" }
+    { #name, "namespace Pokemon{ [Pokemon effect=" #name "] shared class " #name " : PkmnScript { " contents "}}" }
 
 static std::unordered_map<const char*, const char*> _scripts = std::unordered_map<const char*, const char*>{
     AS_CLASS(blankScript, ),
@@ -53,8 +53,11 @@ void StopBeforeAttack(ExecutingMove@ attack, bool& result) override{
         R"(void IsInvulnerable(ExecutingMove@ attack, Pokemon@ target, bool& result) override{ result = !result; })"),
 
     AS_CLASS(OnAttackMissScript,
-             "int value = 0; void OnAttackMiss(ExecutingMove@ attack, Pokemon@ target) override { value++; } "
-             "int GetValue() { return value; }"),
+             R"(
+int value = 0;
+void OnAttackMiss(ExecutingMove@ attack, Pokemon@ target) override { value++; }
+int GetValue() { return value; }
+)"),
     AS_CLASS(
         ChangeAttackTypeScript,
         R"(void ChangeAttackType(ExecutingMove@ attack, Pokemon@ target, uint8 hit, uint8& outType) override{outType = 1; };)"),
@@ -64,15 +67,31 @@ void StopBeforeAttack(ExecutingMove@ attack, bool& result) override{
     AS_CLASS(
         PreventSecondaryEffectsScript,
         R"(void PreventSecondaryEffects(ExecutingMove@ attack, Pokemon@ target, uint8 hit, bool& result) override{ result = !result; })"),
-    AS_CLASS(OnSecondaryEffectScript, "int value = 0; void OnSecondaryEffect(ExecutingMove@ attack, Pokemon@ target, "
-                                      "uint8 hit) override { value++; } "
-                                      "int GetValue() { return value; }"),
+    AS_CLASS(OnSecondaryEffectScript, R"(
+int value = 0;
+void OnSecondaryEffect(ExecutingMove@ attack, Pokemon@ target, uint8 hit) override {
+    value++;
+}
+int GetValue() { return value; })"),
     AS_CLASS(OnAfterHitsScript,
              "int value = 0; void OnAfterHits(ExecutingMove@ attack, Pokemon@ target) override { value++; } "
              "int GetValue() { return value; }"),
     AS_CLASS(throwScript,
              R"(void PreventAttack(ExecutingMove@ attack, bool& result) override{ throw("test exception"); })"),
 
+    AS_CLASS(AddVolatileModMain,
+             R"(
+void OnSecondaryEffect(ExecutingMove@ attack, Pokemon@ target, uint8 hit) override {
+    auto script = cast<AddVolatileModSecondary>(target.AddVolatile("AddVolatileModSecondary"));
+    script.value++;
+};
+)"),
+    AS_CLASS(AddVolatileModSecondary,
+             R"(
+int value = 0;
+int GetValue() { return value; }
+)"),
+
 };
 
 static AngelScriptResolver* _resolverCache = nullptr;
@@ -354,4 +373,37 @@ TEST_CASE("Handle script exceptions.") {
     throw ArbUt::Exception("Didn't throw");
 }
 
+TEST_CASE("Add Volatile with return script function") {
+    auto statCalc = new PkmnLib::Battling::StatCalculator();
+
+    auto resolver = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
+    auto mainLib = new PkmnLib::Battling::BattleLibrary(
+        TestLibrary::BuildStaticLibrary(), statCalc, new PkmnLib::Battling::DamageLibrary(),
+        new PkmnLib::Battling::ExperienceLibrary(), resolver, new PkmnLib::Battling::MiscLibrary());
+    resolver->Initialize(mainLib);
+    for (auto kv : _scripts) {
+        resolver->CreateScript(kv.first, kv.second);
+    }
+    resolver->FinalizeModule();
+
+    auto script = GetScript(mainLib, "AddVolatileModMain"_cnc);
+    auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies"_cnc, 30).Build();
+
+    script->OnSecondaryEffect(nullptr, mon, 0);
+
+    auto scriptObjOption = const_cast<CreatureLib::Battling::ScriptAggregator&>(mon->GetScriptIterator()).GetNextNotNull();
+    REQUIRE(scriptObjOption.has_value());
+    REQUIRE(scriptObjOption.value()->GetName() == "AddVolatileModSecondary"_cnc);
+    auto scriptObj = scriptObjOption.value();
+    auto script2 = scriptObj.As<AngelScriptScript>();
+    auto ctxPool = script2->GetContextPool();
+    auto ctx = ctxPool->RequestContext();
+    script2->PrepareMethod("GetValue"_cnc, ctx);
+    REQUIRE(ctx->Execute() == asEXECUTION_FINISHED);
+    REQUIRE(ctx->GetReturnDWord() == 1);
+    ctxPool->ReturnContextToPool(ctx);
+
+    delete script;
+}
+
 #endif