From 789b5dfd9ef2788e6c5867d53177689eb909b65e Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 23 Mar 2019 20:59:41 +1100
Subject: [PATCH] add rudimentary action comboing, doesn't highlight actions on
 the hotbar

---
 .../action/darkknight/ActionHardSlash3617.cpp | 22 ++++++++++++++++
 .../darkknight/ActionPowerSlash3627.cpp       | 22 ++++++++++++++++
 .../darkknight/ActionSpinningSlash3619.cpp    | 22 ++++++++++++++++
 .../darkknight/ActionSyphonStrike3623.cpp     | 22 ++++++++++++++++
 src/world/Action/Action.cpp                   | 26 +++++++++++++++++++
 src/world/Action/Action.h                     |  2 ++
 src/world/Actor/Chara.cpp                     | 10 +++++++
 src/world/Actor/Chara.h                       |  5 ++++
 8 files changed, 131 insertions(+)
 create mode 100644 src/scripts/action/darkknight/ActionHardSlash3617.cpp
 create mode 100644 src/scripts/action/darkknight/ActionPowerSlash3627.cpp
 create mode 100644 src/scripts/action/darkknight/ActionSpinningSlash3619.cpp
 create mode 100644 src/scripts/action/darkknight/ActionSyphonStrike3623.cpp

diff --git a/src/scripts/action/darkknight/ActionHardSlash3617.cpp b/src/scripts/action/darkknight/ActionHardSlash3617.cpp
new file mode 100644
index 00000000..6b582c04
--- /dev/null
+++ b/src/scripts/action/darkknight/ActionHardSlash3617.cpp
@@ -0,0 +1,22 @@
+#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::Action::Action& action ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( ActionHardSlash3617 );
\ No newline at end of file
diff --git a/src/scripts/action/darkknight/ActionPowerSlash3627.cpp b/src/scripts/action/darkknight/ActionPowerSlash3627.cpp
new file mode 100644
index 00000000..6775947d
--- /dev/null
+++ b/src/scripts/action/darkknight/ActionPowerSlash3627.cpp
@@ -0,0 +1,22 @@
+#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::Action::Action& action ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( ActionPowerSlash3627 );
\ No newline at end of file
diff --git a/src/scripts/action/darkknight/ActionSpinningSlash3619.cpp b/src/scripts/action/darkknight/ActionSpinningSlash3619.cpp
new file mode 100644
index 00000000..3eb592df
--- /dev/null
+++ b/src/scripts/action/darkknight/ActionSpinningSlash3619.cpp
@@ -0,0 +1,22 @@
+#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::Action::Action& action ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( ActionSpinningSlash3619 );
\ No newline at end of file
diff --git a/src/scripts/action/darkknight/ActionSyphonStrike3623.cpp b/src/scripts/action/darkknight/ActionSyphonStrike3623.cpp
new file mode 100644
index 00000000..e765f8d1
--- /dev/null
+++ b/src/scripts/action/darkknight/ActionSyphonStrike3623.cpp
@@ -0,0 +1,22 @@
+#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::Action::Action& action ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( ActionSyphonStrike3623 );
\ No newline at end of file
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index dfadbdaf..a6478379 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -281,6 +281,13 @@ void Sapphire::Action::Action::execute()
     }
   }
 
+  if( isComboAction() )
+  {
+    auto player = m_pSource->getAsPlayer();
+
+    player->sendDebug( "action combo success from action#{0}", player->getLastComboActionId() );
+  }
+
   if( !hasClientsideTarget() )
   {
     pScriptMgr->onExecute( *this );
@@ -290,6 +297,13 @@ void Sapphire::Action::Action::execute()
     pScriptMgr->onEObjHit( *player, m_targetId, getId() );
     return;
   }
+
+  // set currently casted action as the combo action if it interrupts a combo
+  // ignore it otherwise (ogcds, etc.)
+  if( !m_actionData->preservesCombo )
+  {
+    m_pSource->setLastComboActionId( getId() );
+  }
 }
 
 void Sapphire::Action::Action::calculateActionCost()
@@ -399,4 +413,16 @@ uint32_t Sapphire::Action::Action::getAdditionalData() const
 void Sapphire::Action::Action::setAdditionalData( uint32_t data )
 {
   m_additionalData = data;
+}
+
+bool Sapphire::Action::Action::isComboAction() const
+{
+  auto lastActionId = m_pSource->getLastComboActionId();
+
+  if( lastActionId == 0 )
+  {
+    return false;
+  }
+
+  return m_actionData->actionCombo == lastActionId;
 }
\ No newline at end of file
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index 0cd395eb..d1499c31 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -45,6 +45,8 @@ namespace Sapphire::Action
     uint32_t getAdditionalData() const;
     void setAdditionalData( uint32_t data );
 
+    bool isComboAction() const;
+
     /*!
      * @brief Checks if the action *may* target a resident instead of an actor
      * @return true if the target *may* be a resident and not an actor, otherwise false.
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 76033015..68decd9e 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -658,3 +658,13 @@ int64_t Sapphire::Entity::Chara::getLastUpdateTime() const
 {
   return m_lastUpdate;
 }
+
+void Sapphire::Entity::Chara::setLastComboActionId( uint32_t actionId )
+{
+  m_lastComboActionId = actionId;
+}
+
+uint32_t Sapphire::Entity::Chara::getLastComboActionId() const
+{
+  return m_lastComboActionId;
+}
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index 62fdc0ca..d2110ff8 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -102,6 +102,8 @@ namespace Sapphire::Entity
     uint64_t m_targetId;
     /*! Ptr to a queued action */
     Action::ActionPtr m_pCurrentAction;
+    /*! the id of the last combo action used (IgnoresCombo) */
+    uint32_t m_lastComboActionId;
     /*! Invincibility type */
     Common::InvincibilityType m_invincibilityType;
 
@@ -243,6 +245,9 @@ namespace Sapphire::Entity
 
     void setCurrentAction( Action::ActionPtr pAction );
 
+    uint32_t getLastComboActionId() const;
+    void setLastComboActionId( uint32_t actionId );
+
     uint32_t getBonusStat( Common::BaseParam bonus ) const;
 
   };