From a40859e4b472e0f4df330fbe646ca6fc8131e01a Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 10 Feb 2019 23:53:44 +1100
Subject: [PATCH] add single target damage to actions

---
 .../action/playeractions/archer/ActionHeavyShot97.cpp     | 3 ++-
 src/world/Action/Action.cpp                               | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp b/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
index c63baf96..ba9275af 100644
--- a/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
+++ b/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
@@ -1,6 +1,7 @@
 #include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Actor/Player.h>
+#include <Action/Action.h>
 
 class ActionHeavyShot97 :
   public Sapphire::ScriptAPI::ActionScript
@@ -20,7 +21,7 @@ public:
   void onCharaHit( Sapphire::Entity::Chara& sourceActor, Sapphire::Entity::Chara& hitActor,
                    Sapphire::Action::Action& currentAction ) override
   {
-
+    currentAction.damageTarget( 100, hitActor );
   }
 
 };
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index fb589f46..0642f32f 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -242,7 +242,9 @@ void Sapphire::Action::Action::onFinish()
 
   if( !hasResidentTarget() )
   {
+    assert( m_pTarget );
     // todo: calculate final hit targets and call onCharaHit in action script
+    pScriptMgr->onCharaHit( *m_pSource, *m_pTarget, *this );
   }
   else
   {
@@ -286,6 +288,9 @@ void Sapphire::Action::Action::damageTarget( uint32_t amount, Entity::Chara& cha
   // todo: aspected damage?
   chara.takeDamage( amount );
 
+  if( auto player = m_pSource->getAsPlayer() )
+    player->sendDebug( "hit actorId#{0} for damage: {1}", chara.getId(), amount );
+
   m_effects[ EffectPacketIdentity::DamageEffect ].m_entries.emplace_back( entry );
 
   // todo: make sure that we don't add the same actor more than once
@@ -313,6 +318,9 @@ void Sapphire::Action::Action::healTarget( uint32_t amount, Entity::Chara& chara
 
   chara.heal( amount );
 
+  if( auto player = m_pSource->getAsPlayer() )
+    player->sendDebug( "hit actorId#{0} for heal: {1}", chara.getId(), amount );
+
   m_effects[ EffectPacketIdentity::HealingEffect ].m_entries.emplace_back( entry );
 
   // todo: make sure that we don't add the same actor more than once