From d755ea2a321d0abb6383b66731699cc9bcfb3f99 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Jun 2019 02:30:54 +1000
Subject: [PATCH] somewhat working action lut stuff

---
 .../archer/ActionHeavyShot97.cpp              | 23 ---------
 .../playeractions/conjurer/ActionCure120.cpp  | 22 --------
 .../darkknight/ActionAbyssalDrain3641.cpp     | 24 ---------
 .../darkknight/ActionHardSlash3617.cpp        | 23 ---------
 .../darkknight/ActionPowerSlash3627.cpp       | 22 --------
 .../darkknight/ActionSpinningSlash3619.cpp    | 22 --------
 .../darkknight/ActionSyphonStrike3623.cpp     | 22 --------
 .../darkknight/ActionUnleash3621.cpp          | 24 ---------
 .../whitemage/ActionAsylum3569.cpp            | 22 --------
 src/world/Action/Action.cpp                   | 50 +++++++++++--------
 src/world/Action/Action.h                     |  4 +-
 src/world/Action/ActionLut.cpp                | 10 ++++
 src/world/Action/ActionLut.h                  |  1 +
 src/world/Manager/ActionMgr.cpp               |  2 +-
 14 files changed, 44 insertions(+), 227 deletions(-)
 delete mode 100644 src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
 delete mode 100644 src/scripts/action/playeractions/conjurer/ActionCure120.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
 delete mode 100644 src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp

diff --git a/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp b/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
deleted file mode 100644
index 3c3ef16f..00000000
--- a/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionHeavyShot97 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionHeavyShot97() :
-    Sapphire::ScriptAPI::ActionScript( 97 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-    if( auto player = action.getSourceChara()->getAsPlayer() )
-      player->sendDebug( "Imagine you just hit an enemy for 150 potency. Incredible, right?" );
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionHeavyShot97 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/conjurer/ActionCure120.cpp b/src/scripts/action/playeractions/conjurer/ActionCure120.cpp
deleted file mode 100644
index 66284ecb..00000000
--- a/src/scripts/action/playeractions/conjurer/ActionCure120.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionCure120 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionCure120() :
-    Sapphire::ScriptAPI::ActionScript( 120 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionCure120 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp b/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
deleted file mode 100644
index 3c369d1c..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#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::World::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/playeractions/darkknight/ActionHardSlash3617.cpp b/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
deleted file mode 100644
index 1143c0f7..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionHardSlash3617 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionHardSlash3617() :
-    Sapphire::ScriptAPI::ActionScript( 3617 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-    auto chara = action.getHitChara();
-    chara->takeDamage( chara->getMaxHp() * 0.34f );
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionHardSlash3617 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp b/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
deleted file mode 100644
index 74cd54a0..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionPowerSlash3627 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionPowerSlash3627() :
-    Sapphire::ScriptAPI::ActionScript( 3627 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionPowerSlash3627 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp b/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
deleted file mode 100644
index 1074da11..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionSpinningSlash3619 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionSpinningSlash3619() :
-    Sapphire::ScriptAPI::ActionScript( 3619 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionSpinningSlash3619 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp b/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
deleted file mode 100644
index a1d18a74..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionSyphonStrike3623 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionSyphonStrike3623() :
-    Sapphire::ScriptAPI::ActionScript( 3623 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionSyphonStrike3623 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp b/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
deleted file mode 100644
index 5af2e472..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionUnleash3621 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionUnleash3621() :
-    Sapphire::ScriptAPI::ActionScript( 3621 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-    for( auto& chara : action.getHitCharas() )
-    {
-      chara->takeDamage( chara->getMaxHp() * 0.34f );
-    }
-  }
-};
-
-EXPOSE_SCRIPT( ActionUnleash3621 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp b/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp
deleted file mode 100644
index 6ac1c92c..00000000
--- a/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionAsylum3569 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionAsylum3569() :
-    Sapphire::ScriptAPI::ActionScript( 3569 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionAsylum3569 );
\ No newline at end of file
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 3c6da8c5..676c5e95 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -239,17 +239,16 @@ void Action::start()
   player->queuePacket( actionStartPkt );
 
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-  if( !pScriptMgr->onStart( *this ) )
-  {
-    // check the lut initially and see if we have something usable, otherwise cancel the cast
-//    Sapphire::World::Action::ActionLut::validEntryExists( getId() );
 
-    // script not implemented
+  // check the lut too and see if we have something usable, otherwise cancel the cast
+  if( !pScriptMgr->onStart( *this ) && !ActionLut::validEntryExists( getId() ) )
+  {
+    // script not implemented and insufficient lut data (no potencies)
     interrupt();
 
     if( player )
     {
-      player->sendUrgent( "Action not implemented, missing script for action#{0}", getId() );
+      player->sendUrgent( "Action not implemented, missing script/lut entry for action#{0}", getId() );
       player->setCurrentAction( nullptr );
     }
 
@@ -335,7 +334,17 @@ void Action::execute()
     if( !m_hitActors.empty() )
     {
       // only call script if actors are hit
-      pScriptMgr->onExecute( *this );
+      if( !pScriptMgr->onExecute( *this ) && ActionLut::validEntryExists( getId() ) )
+      {
+        auto lutEntry = ActionLut::getEntry( getId() );
+
+        // no script exists but we have a valid lut entry
+        if( auto player = getSourceChara()->getAsPlayer() )
+        {
+          player->sendDebug( "Hit target: pot: {} (f: {}, r: {}), heal pot: {}",
+                             lutEntry.potency, lutEntry.flankPotency, lutEntry.rearPotency, lutEntry.curePotency );
+        }
+      }
     }
   }
   else if( auto player = m_pSource->getAsPlayer() )
@@ -352,18 +361,18 @@ void Action::execute()
   }
 }
 
-bool Action::precheck()
+bool Action::preCheck()
 {
   if( auto player = m_pSource->getAsPlayer() )
   {
-    if( !playerPrecheck( *player ) )
+    if( !playerPreCheck( *player ) )
       return false;
   }
 
   return true;
 }
 
-bool Action::playerPrecheck( Entity::Player& player )
+bool Action::playerPreCheck( Entity::Player& player )
 {
   // lol
   if( !player.isAlive() )
@@ -393,17 +402,18 @@ bool Action::playerPrecheck( Entity::Player& player )
       return false;
   }
 
-  // reset target on actions that can only be casted on yourself while having a target set
-  // todo: check what actions send when targeting an enemy
-//  if( m_actionData->canTargetSelf &&
-//      !m_actionData->canTargetFriendly &&
-//      !m_actionData->canTargetHostile &&
-//      !m_actionData->canTargetParty )
-//  {
-//    setTargetId( getSourceChara() );
-//  }
+  if( !m_actionData->canTargetSelf && getTargetId() == m_pSource->getId() )
+    return false;
 
-  // todo: party/enemy validation
+  // todo: does this need to check for party/alliance stuff or it's just same type?
+  // todo: m_pTarget doesn't exist at this stage because we only fill it when we snapshot targets
+//  if( !m_actionData->canTargetFriendly && m_pSource->getObjKind() == m_pTarget->getObjKind() )
+//    return false;
+//
+//  if( !m_actionData->canTargetHostile && m_pSource->getObjKind() != m_pTarget->getObjKind() )
+//    return false;
+
+  // todo: party/dead validation
 
   // validate range
 
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index b4b12363..9f6671ad 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -75,7 +75,7 @@ namespace Sapphire::World::Action
      * @brief Tests if an action is castable by the current source chara
      * @return true if castable, false if the caster doesn't meet the requirements
      */
-    bool precheck();
+    bool preCheck();
 
     /*!
      * @brief Snapshots characters affected by a cast.
@@ -135,7 +135,7 @@ namespace Sapphire::World::Action
     bool primaryCostCheck( bool subtractCosts );
     bool secondaryCostCheck( bool subtractCosts );
 
-    bool playerPrecheck( Entity::Player& player );
+    bool playerPreCheck( Entity::Player& player );
 
     bool preFilterActor( Entity::Actor& actor ) const;
 
diff --git a/src/world/Action/ActionLut.cpp b/src/world/Action/ActionLut.cpp
index 9c33bb96..16598e8e 100644
--- a/src/world/Action/ActionLut.cpp
+++ b/src/world/Action/ActionLut.cpp
@@ -1,3 +1,4 @@
+#include <cassert>
 #include "ActionLut.h"
 
 using namespace Sapphire::World::Action;
@@ -14,4 +15,13 @@ bool ActionLut::validEntryExists( uint16_t actionId )
   // if all of the fields are 0, it's not 'valid' due to parse error or no useful data in the tooltip
   return entry.potency != 0 || entry.comboPotency != 0 || entry.flankPotency != 0 || entry.frontPotency != 0 ||
          entry.rearPotency != 0 || entry.curePotency != 0;
+}
+
+const ActionEntry& ActionLut::getEntry( uint16_t actionId )
+{
+  auto it = m_actionLut.find( actionId );
+
+  assert( it != m_actionLut.end() );
+
+  return it->second;
 }
\ No newline at end of file
diff --git a/src/world/Action/ActionLut.h b/src/world/Action/ActionLut.h
index 36949eb5..f8eeafa8 100644
--- a/src/world/Action/ActionLut.h
+++ b/src/world/Action/ActionLut.h
@@ -22,6 +22,7 @@ namespace Sapphire::World::Action
     using Lut = std::unordered_map< uint16_t, ActionEntry >;
 
     static bool validEntryExists( uint16_t actionId );
+    static const ActionEntry& getEntry( uint16_t actionId );
 
     static Lut m_actionLut;
   };
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index 1f03d840..84e8cfb2 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -90,7 +90,7 @@ void World::Manager::ActionMgr::bootstrapAction( Entity::Player& player,
                                                  Action::ActionPtr currentAction,
                                                  Data::Action& actionData )
 {
-  if( !currentAction->precheck() )
+  if( !currentAction->preCheck() )
   {
     // forcefully interrupt the action and reset the cooldown
     currentAction->interrupt();