From bcbbca056a352dddb5fab32d4d0755c456870fa5 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 8 Mar 2019 00:26:41 +1100
Subject: [PATCH] fix recast time truncated by field size, correctly send
 actionstart

---
 src/common/Network/CommonActorControl.h       | 10 ++++-----
 .../playeractions/conjurer/ActionCure120.cpp  | 22 +++++++++++++++++++
 .../whitemage/ActionAsylum3569.cpp            | 22 +++++++++++++++++++
 src/world/Action/Action.cpp                   | 21 +++++++++---------
 src/world/Action/Action.h                     |  4 ++--
 src/world/Action/EventAction.cpp              |  2 +-
 6 files changed, 63 insertions(+), 18 deletions(-)
 create mode 100644 src/scripts/action/playeractions/conjurer/ActionCure120.cpp
 create mode 100644 src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index 2cc3515f..e204e931 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -36,13 +36,13 @@ enum ActorControlType : uint16_t
     CastInterrupt = 0x0F,
 
     /*!
-     * @brief Sets the cooldown for an action
+     * @brief Sent when a player uses an action
      *
-     * @param param1 Seems to be always 1 from what I've seen, needs more research
-     * @param param2 The actionid to set the cooldown for
-     * @param param3 The time in milliseconds to apply the cooldown for, 0 resets the cooldown
+     * param1 Seems to be always 1 from what I've seen, needs more research
+     * param2 The actionid
+     * param3 The action cooldown in ms / 10
      */
-    SetActionCooldown = 0x11,
+    ActionStart = 0x11,
 
     StatusEffectGain = 0x14,
     StatusEffectLose = 0x15,
diff --git a/src/scripts/action/playeractions/conjurer/ActionCure120.cpp b/src/scripts/action/playeractions/conjurer/ActionCure120.cpp
new file mode 100644
index 00000000..9d6bc8a7
--- /dev/null
+++ b/src/scripts/action/playeractions/conjurer/ActionCure120.cpp
@@ -0,0 +1,22 @@
+#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::Action::Action& action ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( ActionCure120 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp b/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp
new file mode 100644
index 00000000..1e71dd2e
--- /dev/null
+++ b/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp
@@ -0,0 +1,22 @@
+#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::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 6099f51c..8d318064 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -62,8 +62,8 @@ bool Sapphire::Action::Action::init()
     m_actionData = actionData;
   }
 
-  m_castTime = static_cast< uint32_t >( m_actionData->cast100ms * 100 );
-  m_recastTime = static_cast< uint16_t >( m_actionData->recast100ms * 100 );
+  m_castTimeMs = static_cast< uint32_t >( m_actionData->cast100ms * 100 );
+  m_recastTimeMs = static_cast< uint32_t >( m_actionData->recast100ms * 100 );
   m_cooldownGroup = m_actionData->cooldownGroup;
   m_range = m_actionData->range;
   m_effectRange = m_actionData->effectRange;
@@ -129,17 +129,17 @@ void Sapphire::Action::Action::setInterrupted( Common::ActionInterruptType type
 
 uint32_t Sapphire::Action::Action::getCastTime() const
 {
-  return m_castTime;
+  return m_castTimeMs;
 }
 
 void Sapphire::Action::Action::setCastTime( uint32_t castTime )
 {
-  m_castTime = castTime;
+  m_castTimeMs = castTime;
 }
 
 bool Sapphire::Action::Action::hasCastTime() const
 {
-  return m_castTime > 0;
+  return m_castTimeMs > 0;
 }
 
 Sapphire::Entity::CharaPtr Sapphire::Action::Action::getSourceChara() const
@@ -166,7 +166,7 @@ bool Sapphire::Action::Action::update()
 
   uint64_t currTime = Util::getTimeMs();
 
-  if( !hasCastTime() || std::difftime( currTime, m_startTime ) > m_castTime )
+  if( !hasCastTime() || std::difftime( currTime, m_startTime ) > m_castTimeMs )
   {
     execute();
     return true;
@@ -191,7 +191,7 @@ void Sapphire::Action::Action::start()
     castPacket->data().skillType = Common::SkillType::Normal;
     castPacket->data().unknown_1 = m_id;
     // This is used for the cast bar above the target bar of the caster.
-    castPacket->data().cast_time = m_castTime / 1000.f;
+    castPacket->data().cast_time = m_castTimeMs / 1000.f;
     castPacket->data().target_id = static_cast< uint32_t >( m_targetId );
 
     m_pSource->sendToInRangeSet( castPacket, true );
@@ -202,6 +202,10 @@ void Sapphire::Action::Action::start()
     }
   }
 
+  // todo: m_recastTimeMs needs to be adjusted for player sks/sps
+  auto actionStartPkt = makeActorControl143( m_pSource->getId(), ActorControlType::ActionStart, 1, getId(), m_recastTimeMs / 10 );
+  player->queuePacket( actionStartPkt );
+
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
   if( !pScriptMgr->onStart( *this ) )
   {
@@ -231,9 +235,6 @@ void Sapphire::Action::Action::interrupt()
   {
     auto player = m_pSource->getAsPlayer();
 
-    auto resetCooldownPkt = makeActorControl143( m_pSource->getId(), ActorControlType::SetActionCooldown, 1, getId(), 0 );
-    player->queuePacket( resetCooldownPkt );
-
     // todo: reset cooldown for actual player
 
     // reset state flag
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index 6f3152be..0cd395eb 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -99,8 +99,8 @@ namespace Sapphire::Action
     uint16_t m_primaryCost;
 
     uint64_t m_startTime;
-    uint32_t m_castTime;
-    uint16_t m_recastTime;
+    uint32_t m_castTimeMs;
+    uint32_t m_recastTimeMs;
     uint8_t m_cooldownGroup;
     int8_t m_range;
     uint8_t m_effectRange;
diff --git a/src/world/Action/EventAction.cpp b/src/world/Action/EventAction.cpp
index 806a0b90..349e9040 100644
--- a/src/world/Action/EventAction.cpp
+++ b/src/world/Action/EventAction.cpp
@@ -26,7 +26,7 @@ Sapphire::Action::EventAction::EventAction( Entity::CharaPtr pActor, uint32_t ev
   m_id = action;
   m_pFw = pFw;
   auto pExdData = pFw->get< Data::ExdDataGenerated >();
-  m_castTime = pExdData->get< Sapphire::Data::EventAction >( action )->castTime * 1000; // TODO: Add security checks.
+  m_castTimeMs = pExdData->get< Sapphire::Data::EventAction >( action )->castTime * 1000; // TODO: Add security checks.
   m_onActionFinishClb = std::move( finishRef );
   m_onActionInterruptClb = std::move( interruptRef );
   m_pSource = std::move( pActor );