From 83f6bd247be37a543f7d3f36d779d76a2eeac7cd Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 10 Feb 2019 23:28:15 +1100
Subject: [PATCH] restructure how actionscripts work

---
 src/scripts/action/ActionReturn6.cpp          | 18 ----------
 src/scripts/action/ActionSprint3.cpp          | 17 ---------
 src/scripts/action/common/ActionReturn6.cpp   | 21 +++++++++++
 src/scripts/action/common/ActionSprint3.cpp   | 20 +++++++++++
 .../archer/ActionHeavyShot97.cpp              | 27 ++++++++++++++
 src/world/Action/Action.cpp                   |  9 +++--
 src/world/Actor/PlayerEvent.cpp               |  4 +--
 src/world/Script/NativeScriptApi.cpp          | 11 ++++--
 src/world/Script/NativeScriptApi.h            |  9 +++--
 src/world/Script/ScriptMgr.cpp                | 35 +++++++++++++++++--
 src/world/Script/ScriptMgr.h                  |  5 ++-
 11 files changed, 126 insertions(+), 50 deletions(-)
 delete mode 100644 src/scripts/action/ActionReturn6.cpp
 delete mode 100644 src/scripts/action/ActionSprint3.cpp
 create mode 100644 src/scripts/action/common/ActionReturn6.cpp
 create mode 100644 src/scripts/action/common/ActionSprint3.cpp
 create mode 100644 src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp

diff --git a/src/scripts/action/ActionReturn6.cpp b/src/scripts/action/ActionReturn6.cpp
deleted file mode 100644
index 3734a060..00000000
--- a/src/scripts/action/ActionReturn6.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include "../ScriptObject.h"
-#include <Actor/Player.h>
-
-class ActionReturn6 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionReturn6() :
-    Sapphire::ScriptAPI::ActionScript( 6 )
-  {
-  }
-
-  void onCastFinish( Sapphire::Entity::Player& player, Sapphire::Entity::Chara& targetActor ) override
-  {
-    player.returnToHomepoint();
-  }
-};
\ No newline at end of file
diff --git a/src/scripts/action/ActionSprint3.cpp b/src/scripts/action/ActionSprint3.cpp
deleted file mode 100644
index bf725e63..00000000
--- a/src/scripts/action/ActionSprint3.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-
-class ActionSprint3 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionSprint3() :
-    Sapphire::ScriptAPI::ActionScript( 3 )
-  {
-  }
-
-  void onCastFinish( Sapphire::Entity::Player& player, Sapphire::Entity::Chara& targetActor ) override
-  {
-    player.addStatusEffectByIdIfNotExist( 50, 20000, player, 30 );
-  }
-};
\ No newline at end of file
diff --git a/src/scripts/action/common/ActionReturn6.cpp b/src/scripts/action/common/ActionReturn6.cpp
new file mode 100644
index 00000000..47caadfb
--- /dev/null
+++ b/src/scripts/action/common/ActionReturn6.cpp
@@ -0,0 +1,21 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+
+class ActionReturn6 :
+  public Sapphire::ScriptAPI::ActionScript
+{
+public:
+  ActionReturn6() :
+    Sapphire::ScriptAPI::ActionScript( 6 )
+  {
+  }
+
+  void onCastFinish( Sapphire::Entity::Chara& sourceActor, Sapphire::Action::Action& currentAction ) override
+  {
+    if( !sourceActor.isPlayer() )
+      return;
+
+    sourceActor.getAsPlayer()->returnToHomepoint();
+  }
+};
\ No newline at end of file
diff --git a/src/scripts/action/common/ActionSprint3.cpp b/src/scripts/action/common/ActionSprint3.cpp
new file mode 100644
index 00000000..58b0cadf
--- /dev/null
+++ b/src/scripts/action/common/ActionSprint3.cpp
@@ -0,0 +1,20 @@
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+
+class ActionSprint3 :
+  public Sapphire::ScriptAPI::ActionScript
+{
+public:
+  ActionSprint3() :
+    Sapphire::ScriptAPI::ActionScript( 3 )
+  {
+  }
+
+  void onCastFinish( Sapphire::Entity::Chara& sourceActor, Sapphire::Action::Action& currentAction ) override
+  {
+    if( !sourceActor.isPlayer() )
+      return;
+
+    sourceActor.getAsPlayer()->addStatusEffectByIdIfNotExist( 50, 20000, sourceActor, 30 );
+  }
+};
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp b/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
new file mode 100644
index 00000000..c63baf96
--- /dev/null
+++ b/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
@@ -0,0 +1,27 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+
+class ActionHeavyShot97 :
+  public Sapphire::ScriptAPI::ActionScript
+{
+public:
+  ActionHeavyShot97() :
+    Sapphire::ScriptAPI::ActionScript( 97 )
+  {
+  }
+
+  void onCastFinish( Sapphire::Entity::Chara& source, Sapphire::Action::Action& currentAction ) override
+  {
+    if( auto player = source.getAsPlayer() )
+      player->sendDebug( "cast finished" );
+  }
+
+  void onCharaHit( Sapphire::Entity::Chara& sourceActor, Sapphire::Entity::Chara& hitActor,
+                   Sapphire::Action::Action& currentAction ) override
+  {
+
+  }
+
+};
+
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index ea8d5718..3807d1ed 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -156,7 +156,7 @@ void Sapphire::Action::Action::onStart()
   auto player = m_pSource->getAsPlayer();
   if( player )
   {
-    player->sendDebug( "onStart()" );
+    player->sendDebug( "onCastStart()" );
   }
 
   if( isCastedAction() )
@@ -197,7 +197,7 @@ void Sapphire::Action::Action::onInterrupt()
     //player->unsetStateFlag( PlayerStateFlag::Occupied1 );
     player->unsetStateFlag( PlayerStateFlag::Casting );
 
-    player->sendDebug( "onInterrupt()" );
+    player->sendDebug( "onCastInterrupt()" );
   }
 
   if( isCastedAction() )
@@ -234,12 +234,15 @@ void Sapphire::Action::Action::onFinish()
 
   if( !hasResidentTarget() )
   {
-    pScriptMgr->onCastFinish( *pPlayer, m_pTarget, m_id );
+    pScriptMgr->onCastFinish( *m_pSource, *this );
   }
   else
   {
     pScriptMgr->onEObjHit( *pPlayer, m_targetId );
+    return;
   }
+
+  // todo: calculate final hit targets and call onCharaHit in action script
 }
 
 void Sapphire::Action::Action::buildEffectPacket()
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index ba504475..7876d724 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -300,7 +300,7 @@ void Sapphire::Entity::Player::eventActionStart( uint32_t eventId,
 //
 //  if( pEvent )
 //    pEvent->setPlayedScene( true );
-//  pEventAction->onStart();
+//  pEventAction->onCastStart();
 }
 
 
@@ -315,7 +315,7 @@ void Sapphire::Entity::Player::eventItemActionStart( uint32_t eventId,
 //
 //  setCurrentAction( pEventItemAction );
 //
-//  pEventItemAction->onStart();
+//  pEventItemAction->onCastStart();
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/world/Script/NativeScriptApi.cpp b/src/world/Script/NativeScriptApi.cpp
index 66679465..2a1a21bb 100644
--- a/src/world/Script/NativeScriptApi.cpp
+++ b/src/world/Script/NativeScriptApi.cpp
@@ -88,15 +88,20 @@ namespace Sapphire::ScriptAPI
   {
   }
 
-  void ActionScript::onStart( Entity::Chara& sourceActor, Entity::Chara& targetActor )
+  void ActionScript::onCastStart( Entity::Chara& sourceActor, Sapphire::Action::Action& currentAction )
   {
   }
 
-  void ActionScript::onCastFinish( Entity::Player& player, Entity::Chara& targetActor )
+  void ActionScript::onCastFinish( Entity::Chara& sourceActor, Sapphire::Action::Action& currentAction )
   {
   }
 
-  void ActionScript::onInterrupt( Entity::Chara& sourceActor/*, Sapphire::Entity::Chara targetActor*/ )
+  void ActionScript::onCastInterrupt( Entity::Chara& sourceActor, Sapphire::Action::Action& currentAction )
+  {
+  }
+
+  void ActionScript::onCharaHit( Sapphire::Entity::Chara& sourceActor, Sapphire::Entity::Chara& hitActor,
+                                 Sapphire::Action::Action& currentAction )
   {
   }
 
diff --git a/src/world/Script/NativeScriptApi.h b/src/world/Script/NativeScriptApi.h
index 24f8851e..25ffdfd7 100644
--- a/src/world/Script/NativeScriptApi.h
+++ b/src/world/Script/NativeScriptApi.h
@@ -140,11 +140,14 @@ namespace Sapphire::ScriptAPI
   public:
     explicit ActionScript( uint32_t abilityId );
 
-    virtual void onStart( Sapphire::Entity::Chara& sourceActor, Sapphire::Entity::Chara& targetActor );
+    virtual void onCastStart( Sapphire::Entity::Chara& sourceActor, Sapphire::Action::Action& currentAction );
 
-    virtual void onCastFinish( Sapphire::Entity::Player& player, Sapphire::Entity::Chara& targetActor );
+    virtual void onCastFinish( Sapphire::Entity::Chara& sourceActor, Sapphire::Action::Action& currentAction );
 
-    virtual void onInterrupt( Sapphire::Entity::Chara& sourceActor/*, Sapphire::Entity::Chara targetActor*/ );
+    virtual void onCastInterrupt( Sapphire::Entity::Chara& sourceActor, Sapphire::Action::Action& currentAction );
+
+    virtual void onCharaHit( Sapphire::Entity::Chara& sourceActor, Sapphire::Entity::Chara& hitActor,
+                             Sapphire::Action::Action& currentAction );
   };
 
   /*!
diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp
index 69cd1543..5c67f103 100644
--- a/src/world/Script/ScriptMgr.cpp
+++ b/src/world/Script/ScriptMgr.cpp
@@ -9,6 +9,7 @@
 #include "Actor/EventObject.h"
 #include "ServerMgr.h"
 #include "Event/EventHandler.h"
+#include "Action/Action.h"
 
 #include "Manager/EventMgr.h"
 
@@ -325,12 +326,40 @@ bool Sapphire::Scripting::ScriptMgr::onEObjHit( Sapphire::Entity::Player& player
   return true;
 }
 
-bool Sapphire::Scripting::ScriptMgr::onCastFinish( Entity::Player& player, Entity::CharaPtr pTarget, uint32_t actionId )
+bool Sapphire::Scripting::ScriptMgr::onCastFinish( Entity::Chara& sourceActor, Action::Action& currentAction )
 {
-  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ActionScript >( actionId );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ActionScript >( currentAction.getId() );
 
   if( script )
-    script->onCastFinish( player, *pTarget );
+    script->onCastFinish( sourceActor, currentAction );
+  return true;
+}
+
+bool Sapphire::Scripting::ScriptMgr::onCastInterrupt( Entity::Chara& sourceActor, Action::Action& currentAction )
+{
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ActionScript >( currentAction.getId() );
+
+  if( script )
+    script->onCastInterrupt( sourceActor, currentAction );
+  return true;
+}
+
+bool Sapphire::Scripting::ScriptMgr::onCastStart( Entity::Chara& sourceActor, Action::Action& currentAction )
+{
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ActionScript >( currentAction.getId() );
+
+  if( script )
+    script->onCastStart( sourceActor, currentAction );
+  return true;
+}
+
+bool Sapphire::Scripting::ScriptMgr::onCharaHit( Entity::Chara& sourceActor, Entity::Chara& hitActor,
+                                                 Action::Action& currentAction )
+{
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ActionScript >( currentAction.getId() );
+
+  if( script )
+    script->onCharaHit( sourceActor, hitActor, currentAction );
   return true;
 }
 
diff --git a/src/world/Script/ScriptMgr.h b/src/world/Script/ScriptMgr.h
index 1217caa4..7614caac 100644
--- a/src/world/Script/ScriptMgr.h
+++ b/src/world/Script/ScriptMgr.h
@@ -72,7 +72,10 @@ namespace Sapphire::Scripting
 
     bool onEObjHit( Entity::Player& player, uint64_t actorId );
 
-    bool onCastFinish( Entity::Player& pPlayer, Entity::CharaPtr pTarget, uint32_t actionId );
+    bool onCastStart( Entity::Chara& sourceActor, Action::Action& currentAction );
+    bool onCastInterrupt( Entity::Chara& sourceActor, Action::Action& currentAction );
+    bool onCastFinish( Entity::Chara& sourceActor, Action::Action& currentAction );
+    bool onCharaHit( Entity::Chara& sourceActor, Entity::Chara& hitActor, Action::Action& currentAction );
 
     bool onStatusReceive( Entity::CharaPtr pActor, uint32_t effectId );