add invincibility to ifrit hellfire

Author: takhlaq

data/actions/IfritNormal.json

@@ -80,18 +80,7 @@
     "nextCombo": [],
     "aggroModifier": 1.0,
     "statuses": {
-      "caster": [
-        {
-          "id": 325,
-          "duration": 8000,
-          "modifiers": [
-            {
-              "modifier": "DamageTakenPercent",
-              "value": -100
-            }
-          ]
-        }
-      ],
+      "caster": [],
       "target": []
     }
   },

data/encounterTimelines/IfritNormal.json

@@ -290,6 +290,15 @@
               "startTime": 0,
               "type": "bNpcFlags"
             },
+            {
+              "data": {
+                "actionTimelineId": 140,
+                "actorName": "Ifrit"
+              },
+              "description": "",
+              "startTime": 2000,
+              "type": "actionTimeline"
+            },
             {
               "data": {
                 "actorName": "Ifrit",
@@ -306,18 +315,9 @@
                 "targetType": "self"
               },
               "description": "",
-              "startTime": 0,
+              "startTime": 2100,
               "type": "setPos"
             },
-            {
-              "data": {
-                "actionTimelineId": 140,
-                "actorName": "Ifrit"
-              },
-              "description": "",
-              "startTime": 2000,
-              "type": "actionTimeline"
-            },
             {
               "data": {
                 "actionTimelineId": 141,

src/scripts/action/mobs/family/Ifrit/ActionHellfire.cpp

@@ -23,6 +23,22 @@ class ActionHellfire : public Sapphire::ScriptAPI::ActionScript
 
   static constexpr auto Potency = 300;
 
+  virtual void onStart( Sapphire::World::Action::Action& action ) override
+  {
+    auto pChara = action.getSourceChara();
+
+    // todo: should just put the modifier in the status script?
+    std::vector< World::Action::StatusModifier > modifiers = {
+      { { Common::ParamModifier::DamageTakenPercent, -100 } }
+    };
+    
+    auto pEffect = std::make_shared< Sapphire::StatusEffect::StatusEffect >(
+            325, pChara, pChara, 8000, modifiers, 0, 3000
+    );
+
+    pChara->addStatusEffect( pEffect );
+  }
+
   void onExecute( Sapphire::World::Action::Action& action ) override
   {
     auto pSource = action.getSourceChara();

src/scripts/action/mobs/family/Ifrit/ActionVulcanBurst.cpp

@@ -44,8 +44,8 @@ class ActionVulcanBurst : public Sapphire::ScriptAPI::ActionScript
       pActionBuilder->damage( pSource, pTarget, dmg.first, dmg.second );
 
       // todo:
-      //if( dmg.first > 0 )
-      //  pTarget->knockback( pSource->getPos(), 20.f );
+      if( dmg.first > 0 )
+        pTarget->knockback( pSource->getPos(), 20.f );
     }
   }
 };

src/scripts/statuseffect/buffs/StatusEffectInvincibility.cpp

@@ -0,0 +1,31 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include "StatusEffect/StatusEffect.h"
+
+#include <Action/CommonAction.h>
+#include <Actor/Chara.h>
+
+#include "Common.h"
+
+using namespace Sapphire;
+using namespace Sapphire::World::Action;
+
+class StatusEffectInvincibility : public Sapphire::ScriptAPI::StatusEffectScript
+{
+public:
+  StatusEffectInvincibility() : Sapphire::ScriptAPI::StatusEffectScript( 325 )
+  {
+  }
+
+  void onApply( Entity::Chara& actor ) override
+  {
+    actor.setInvincibilityType( Common::InvincibilityIgnoreDamage );
+  }
+
+  void onExpire( Entity::Chara& actor ) override
+  {
+    actor.setInvincibilityType( Common::InvincibilityNone );
+  }
+};
+
+EXPOSE_SCRIPT( StatusEffectInvincibility );

src/world/Action/Action.cpp

@@ -982,15 +982,14 @@ void Action::Action::addDefaultActorFilters()
 {
   switch( m_castType )
   {
-    // todo: figure these out and remove 5/RectangularAOE to own handler
-    case( Common::CastType ) 5:
     case Common::CastType::SingleTarget:
     {
       auto filter = std::make_shared< World::Util::ActorFilterSingleTarget >( static_cast< uint32_t >( m_targetId ) );
       addActorFilter( filter );
       break;
     }
-
+    // todo: what is this CastType::Unknown (5)? seems to be another circular aoe?
+    case Common::CastType::Unknown:
     case Common::CastType::Circle:
     {
       auto filter = std::make_shared< World::Util::ActorFilterInRange >( m_pos, m_effectRange );

src/world/Actor/BNpc.cpp

@@ -768,7 +768,7 @@ void BNpc::notifyPlayerDeaggro( const CharaPtr& pChara )
   if( getTriggerOwnerId() == pChara->getId() )
   {
     auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
-    auto bnpc = *getAsBNpc();
+    auto& bnpc = *getAsBNpc();
     scriptMgr.onTriggerOwnerDeaggro( *tmpPlayer, bnpc );
   }
 }

src/world/Actor/Chara.cpp

@@ -437,8 +437,14 @@ void Chara::takeDamage( uint32_t damage, bool broadcastUpdate )
         break;
     }
   }
-  else
+  else if( m_invincibilityType != InvincibilityIgnoreDamage )
+  {
     m_hp -= damage;
+  }
+  else
+  {
+    damage = 0;
+  }
 
   if( broadcastUpdate )
   {
@@ -548,6 +554,10 @@ void Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEffect )
   pEffect->setSlot( nextSlot );
   m_statusEffectMap[ nextSlot ] = pEffect;
   pEffect->applyStatus();
+
+  Network::Util::Packet::sendActorControl( getInRangePlayerIds( isPlayer() ), getId(), StatusEffectGain,
+                                           pEffect->getId() );
+  Network::Util::Packet::sendHudParam( *this );
 }
 
 /*! \param StatusEffectPtr to be applied to the actor */
@@ -596,13 +606,13 @@ void Chara::replaceSingleStatusEffect( uint32_t slotId, StatusEffect::StatusEffe
   pStatus->applyStatus();
 }
 
-void Chara::replaceSingleStatusEffectById( uint32_t id )
+void Chara::replaceSingleStatusEffectById( uint32_t id, StatusEffect::StatusEffectPtr pStatus )
 {
   for( const auto& effectIt : m_statusEffectMap )
   {
     if( effectIt.second->getId() == id )
     {
-      removeStatusEffect( effectIt.first, false );
+      replaceSingleStatusEffect( effectIt.first, pStatus );
       break;
     }
   }
@@ -1063,16 +1073,25 @@ void Chara::knockback( const FFXIVARR_POSITION3& origin, float distance, bool ig
     }
     setPos( navPos );
     // speed needs to be reset properly here
-    pNav->updateAgentPosition( getAgentId(), getPos(), getRadius(), 1 );
+    setAgentId( pNav->updateAgentPosition( getAgentId(), getPos(), getRadius(), pNav->getAgentSpeed( getAgentId() ) ) );
   }
   else
   {
     setPos( kbPos );
   }
   pTeri->updateActorPosition( *this );
+
+  auto pTransferPacket = makeZonePacket< FFXIVIpcTransfer >( getId() );
+  pTransferPacket->data().dir = Common::Util::floatToUInt16Rot( getRot() );
+  pTransferPacket->data().pos[ 0 ] = Common::Util::floatToUInt16( kbPos.x );
+  pTransferPacket->data().pos[ 1 ] = Common::Util::floatToUInt16( kbPos.y );
+  pTransferPacket->data().pos[ 2 ] = Common::Util::floatToUInt16( kbPos.z );
+  pTransferPacket->data().duration = 1.0f;
+
   // todo: send the correct knockback packet to player
   server().queueForPlayers( getInRangePlayerIds(),
-                            std::make_shared< MoveActorPacket >( *this, getRotUInt8(), 2, 0, 0, 0x5A / 4 ) );
+                            pTransferPacket );
+
 }
 
 void Chara::createAreaObject( uint32_t actionId, uint32_t actionPotency, uint32_t vfxId, float scale,

src/world/Actor/Chara.h

@@ -146,7 +146,7 @@ namespace Sapphire::Entity
 
     void replaceSingleStatusEffect( uint32_t slotId, StatusEffect::StatusEffectPtr pStatus );
 
-    void replaceSingleStatusEffectById( uint32_t id );
+    void replaceSingleStatusEffectById( uint32_t id, StatusEffect::StatusEffectPtr pStatus );
 
     void removeSingleStatusEffectById( uint32_t id );
 

src/world/Encounter/Timepoint.cpp

@@ -539,7 +539,8 @@ namespace Sapphire
           if( pBNpc->getAgentId() != -1 )
           {
             auto pNavi = pTeri->getNaviProvider();
-            pBNpc->setAgentId( pNavi->updateAgentPosition( pBNpc->getAgentId(), pos, pBNpc->getRadius(), pNavi->getAgentSpeed( pBNpc->getAgentId() ) ) );
+            if( pNavi )
+              pBNpc->setAgentId( pNavi->updateAgentPosition( pBNpc->getAgentId(), pos, pBNpc->getRadius(), pNavi->getAgentSpeed( pBNpc->getAgentId() ) ) );
           }
           pBNpc->setRot( rot );
           pBNpc->setPos( pos, true );