From 0b045db81115c1c28564e9dcb9f3c053538ea152 Mon Sep 17 00:00:00 2001
From: Deukhoofd <deukhoofd@gmail.com>
Date: Fri, 10 Apr 2020 23:21:43 +0200
Subject: [PATCH] Removed OnStatusMove hook.

---
 .../AngelScript/AngelScriptScript.hpp         |  9 ---------
 .../AngelScript/AngelScriptTypeInfo.hpp       |  1 -
 .../TypeRegistry/BasicScriptClass.cpp         |  1 -
 tests/ScriptTests/BaseScriptClassTests.cpp    | 20 -------------------
 4 files changed, 31 deletions(-)

diff --git a/src/ScriptResolving/AngelScript/AngelScriptScript.hpp b/src/ScriptResolving/AngelScript/AngelScriptScript.hpp
index 5a46ed8..49eff8a 100644
--- a/src/ScriptResolving/AngelScript/AngelScriptScript.hpp
+++ b/src/ScriptResolving/AngelScript/AngelScriptScript.hpp
@@ -167,15 +167,6 @@ public:
         })
     }
 
-    void OnStatusMove(const CreatureLib::Battling::ExecutingAttack* attack, CreatureLib::Battling::Creature* target,
-                      uint8_t hitNumber) override {
-        CALL_HOOK(OnStatusMove, {
-            ctx->SetArgObject(0, (void*)attack);
-            ctx->SetArgObject(1, (void*)target);
-            ctx->SetArgByte(2, hitNumber);
-        })
-    }
-
     void PreventSecondaryEffects(const CreatureLib::Battling::ExecutingAttack* attack,
                                  CreatureLib::Battling::Creature* target, uint8_t hitNumber, bool* outResult) override {
         CALL_HOOK(PreventSecondaryEffects, {
diff --git a/src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp b/src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp
index 7a818f0..3508fc8 100644
--- a/src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp
+++ b/src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp
@@ -90,7 +90,6 @@ public:
     SCRIPT_HOOK_FUNCTION(OnAttackMiss, "void OnAttackMiss(ExecutingMove@ attack, Pokemon@ target)");
     SCRIPT_HOOK_FUNCTION(ChangeAttackType,
                          "void ChangeAttackType(ExecutingMove@ attack, Pokemon@ target, uint8 hit, uint8& outType)");
-    SCRIPT_HOOK_FUNCTION(OnStatusMove, "void OnStatusMove(ExecutingMove@ attack, Pokemon@ target, uint8 hit)");
     SCRIPT_HOOK_FUNCTION(
         PreventSecondaryEffects,
         "void PreventSecondaryEffects(ExecutingMove@ attack, Pokemon@ target, uint8 hit, bool& outResult)");
diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp
index 9832b61..42aa0b2 100644
--- a/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp
+++ b/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp
@@ -18,7 +18,6 @@ shared abstract class PkmnScript {
     void IsInvulnerable(ExecutingMove@ attack, Pokemon@ target, bool& result){};
     void OnAttackMiss(ExecutingMove@ attack, Pokemon@ target){};
     void ChangeAttackType(ExecutingMove@ attack, Pokemon@ target, uint8 hit, uint8& outType){};
-    void OnStatusMove(ExecutingMove@ attack, Pokemon@ target, uint8 hit){};
     void PreventSecondaryEffects(ExecutingMove@ attack, Pokemon@ target, uint8 hit, bool& outResult){};
     void OnSecondaryEffect(ExecutingMove@ attack, Pokemon@ target, uint8 hit){};
     void OnAfterHits(ExecutingMove@ attack, Pokemon@ target){};
diff --git a/tests/ScriptTests/BaseScriptClassTests.cpp b/tests/ScriptTests/BaseScriptClassTests.cpp
index d3fba7d..6a0b634 100644
--- a/tests/ScriptTests/BaseScriptClassTests.cpp
+++ b/tests/ScriptTests/BaseScriptClassTests.cpp
@@ -58,10 +58,6 @@ void StopBeforeAttack(ExecutingMove@ attack, bool& result) override{
     AS_CLASS(
         ChangeAttackTypeScript,
         R"(void ChangeAttackType(ExecutingMove@ attack, Pokemon@ target, uint8 hit, uint8& outType) override{outType = 1; };)"),
-    AS_CLASS(
-        OnStatusMoveScript,
-        "int value = 0; void OnStatusMove(ExecutingMove@ attack, Pokemon@ target, uint8 hit) override { value++; } "
-        "int GetValue() { return value; }"),
     AS_CLASS(
         PreventSecondaryEffectsScript,
         R"(void PreventSecondaryEffects(ExecutingMove@ attack, Pokemon@ target, uint8 hit, bool& result) override{ result = !result; })"),
@@ -277,22 +273,6 @@ TEST_CASE("Invoke ChangeAttackType script function") {
     delete script;
 }
 
-TEST_CASE("Invoke OnStatusMove script function") {
-    auto mainLib = TestLibrary::GetLibrary();
-    auto script = GetScript(mainLib, "OnStatusMoveScript"_cnc);
-
-    script->OnStatusMove(nullptr, nullptr, 0);
-
-    auto ctxPool = script->GetContextPool();
-    auto ctx = ctxPool->RequestContext();
-    script->PrepareMethod("GetValue"_cnc, ctx);
-    REQUIRE(ctx->Execute() == asEXECUTION_FINISHED);
-    REQUIRE(ctx->GetReturnDWord() == 1);
-    ctxPool->ReturnContextToPool(ctx);
-
-    delete script;
-}
-
 TEST_CASE("Invoke PreventSecondaryEffects script function") {
     auto mainLib = TestLibrary::GetLibrary();
     auto script = GetScript(mainLib, "PreventSecondaryEffectsScript"_cnc);