From 03856a339c3518b81f29bfd4ac080e0a20646ef6 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 7 Apr 2019 16:31:09 +1000
Subject: [PATCH] refactoring, make ranged targeted aoe actions work somewhat
 properly

---
 .../darkknight/ActionAbyssalDrain3641.cpp     | 24 +++++++++++++++++++
 .../darkknight/ActionHardSlash3617.cpp        |  6 ++---
 .../darkknight/ActionPowerSlash3627.cpp       |  0
 .../darkknight/ActionSpinningSlash3619.cpp    |  0
 .../darkknight/ActionSyphonStrike3623.cpp     |  0
 .../darkknight/ActionUnleash3621.cpp          |  2 +-
 src/world/Action/Action.cpp                   | 18 ++++++++++++--
 src/world/Action/Action.h                     |  4 ++--
 src/world/Manager/ActionMgr.cpp               |  3 ---
 9 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
 rename src/scripts/action/{ => playeractions}/darkknight/ActionHardSlash3617.cpp (77%)
 rename src/scripts/action/{ => playeractions}/darkknight/ActionPowerSlash3627.cpp (100%)
 rename src/scripts/action/{ => playeractions}/darkknight/ActionSpinningSlash3619.cpp (100%)
 rename src/scripts/action/{ => playeractions}/darkknight/ActionSyphonStrike3623.cpp (100%)
 rename src/scripts/action/{ => playeractions}/darkknight/ActionUnleash3621.cpp (90%)

diff --git a/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp b/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
new file mode 100644
index 00000000..4d302333
--- /dev/null
+++ b/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
@@ -0,0 +1,24 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+#include <Action/Action.h>
+
+class ActionAbyssalDrain3641 :
+  public Sapphire::ScriptAPI::ActionScript
+{
+public:
+  ActionAbyssalDrain3641() :
+    Sapphire::ScriptAPI::ActionScript( 3641 )
+  {
+  }
+
+  void onExecute( Sapphire::Action::Action& action ) override
+  {
+    for( auto& chara : action.getHitCharas() )
+    {
+      chara->takeDamage( chara->getMaxHp() * 0.5f );
+    }
+  }
+};
+
+EXPOSE_SCRIPT( ActionAbyssalDrain3641 );
\ No newline at end of file
diff --git a/src/scripts/action/darkknight/ActionHardSlash3617.cpp b/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
similarity index 77%
rename from src/scripts/action/darkknight/ActionHardSlash3617.cpp
rename to src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
index bd39b3ea..6d76fdb0 100644
--- a/src/scripts/action/darkknight/ActionHardSlash3617.cpp
+++ b/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
@@ -14,10 +14,8 @@ public:
 
   void onExecute( Sapphire::Action::Action& action ) override
   {
-    for( auto& chara : action.getHitActors() )
-    {
-      chara->takeDamage( chara->getMaxHp() * 0.34f );
-    }
+    auto chara = action.getHitChara();
+    chara->takeDamage( chara->getMaxHp() * 0.34f );
   }
 
 };
diff --git a/src/scripts/action/darkknight/ActionPowerSlash3627.cpp b/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
similarity index 100%
rename from src/scripts/action/darkknight/ActionPowerSlash3627.cpp
rename to src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
diff --git a/src/scripts/action/darkknight/ActionSpinningSlash3619.cpp b/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
similarity index 100%
rename from src/scripts/action/darkknight/ActionSpinningSlash3619.cpp
rename to src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
diff --git a/src/scripts/action/darkknight/ActionSyphonStrike3623.cpp b/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
similarity index 100%
rename from src/scripts/action/darkknight/ActionSyphonStrike3623.cpp
rename to src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
diff --git a/src/scripts/action/darkknight/ActionUnleash3621.cpp b/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
similarity index 90%
rename from src/scripts/action/darkknight/ActionUnleash3621.cpp
rename to src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
index dd06d42e..2e735af6 100644
--- a/src/scripts/action/darkknight/ActionUnleash3621.cpp
+++ b/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
@@ -14,7 +14,7 @@ public:
 
   void onExecute( Sapphire::Action::Action& action ) override
   {
-    for( auto& chara : action.getHitActors() )
+    for( auto& chara : action.getHitCharas() )
     {
       chara->takeDamage( chara->getMaxHp() * 0.34f );
     }
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 5e06838f..97843131 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -100,6 +100,20 @@ bool Sapphire::Action::Action::init()
   m_primaryCostType = static_cast< Common::ActionPrimaryCostType >( m_actionData->costType );
   m_primaryCost = m_actionData->cost;
 
+  if( !m_actionData->targetArea )
+  {
+    // override pos to target position
+    // todo: this is kinda dirty
+    for( auto& actor : m_pSource->getInRangeActors() )
+    {
+      if( actor->getId() == m_targetId )
+      {
+        m_pos = actor->getPos();
+        break;
+      }
+    }
+  }
+
   // todo: add missing rows for secondaryCostType/secondaryCostType and rename the current rows to primaryCostX
 
   addDefaultActorFilters();
@@ -558,12 +572,12 @@ bool Sapphire::Action::Action::preFilterActor( Sapphire::Entity::Actor& actor )
   return true;
 }
 
-std::vector< Sapphire::Entity::CharaPtr >& Sapphire::Action::Action::getHitActors()
+std::vector< Sapphire::Entity::CharaPtr >& Sapphire::Action::Action::getHitCharas()
 {
   return m_hitActors;
 }
 
-Sapphire::Entity::CharaPtr Sapphire::Action::Action::getHitActor()
+Sapphire::Entity::CharaPtr Sapphire::Action::Action::getHitChara()
 {
   if( !m_hitActors.empty() )
   {
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index 6c689a13..e1c57d2d 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -97,13 +97,13 @@ namespace Sapphire::Action
     void addDefaultActorFilters();
 
 
-    std::vector< Entity::CharaPtr >& getHitActors();
+    std::vector< Entity::CharaPtr >& getHitCharas();
 
     /*!
      * @brief Returns the first hit actor inside the m_hitActors vector.
      * @return The CharaPtr otherwise nullptr
      */
-    Entity::CharaPtr getHitActor();
+    Entity::CharaPtr getHitChara();
 
     /*!
      * @brief Starts the cast. Finishes it immediately if there is no cast time (weaponskills).
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index 87c37897..aa02bb4d 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -47,9 +47,6 @@ void World::Manager::ActionMgr::handleTargetedPlayerAction( Entity::Player& play
 
   action->setTargetId( targetId );
 
-  if( player.getId() == targetId )
-    action->setPos( player.getPos() );
-
   if( !action->init() )
     return;