From 7f702488368fab187abe792b5e866aaea5d82eae Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Mon, 6 Mar 2023 23:04:30 +0100
Subject: [PATCH 01/45] Check statuses to determine valid lut entry

---
 src/world/Action/Action.cpp    | 3 ++-
 src/world/Action/ActionLut.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index d78ebe2e6b..c522015d6b 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -864,7 +864,8 @@ Entity::CharaPtr Action::Action::getHitChara()
 bool Action::Action::hasValidLutEntry() const
 {
   return m_lutEntry.potency != 0 || m_lutEntry.comboPotency != 0 || m_lutEntry.flankPotency != 0 || m_lutEntry.frontPotency != 0 ||
-    m_lutEntry.rearPotency != 0 || m_lutEntry.curePotency != 0 || m_lutEntry.restoreMPPercentage != 0;
+    m_lutEntry.rearPotency != 0 || m_lutEntry.curePotency != 0 || m_lutEntry.restoreMPPercentage != 0 ||
+    m_lutEntry.statuses.caster.size() > 0 || m_lutEntry.statuses.target.size() > 0;
 }
 
 Action::EffectBuilderPtr Action::Action::getEffectbuilder()
diff --git a/src/world/Action/ActionLut.cpp b/src/world/Action/ActionLut.cpp
index 38746ca9d9..69824c431f 100644
--- a/src/world/Action/ActionLut.cpp
+++ b/src/world/Action/ActionLut.cpp
@@ -15,7 +15,8 @@ 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;
+         entry.rearPotency != 0 || entry.curePotency != 0 ||
+         entry.statuses.caster.size() > 0 || entry.statuses.target.size() > 0;
 }
 
 const ActionEntry& ActionLut::getEntry( uint16_t actionId )

From 114bd28538c7132bda8bb0b82a4f3bc2d9af9179 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Mon, 6 Mar 2023 23:05:21 +0100
Subject: [PATCH 02/45] Add duration field to statuses

---
 src/tools/action_parse/main.cpp  | 2 ++
 src/world/Action/ActionLut.h     | 1 +
 src/world/Action/ActionLutData.h | 1 +
 3 files changed, 4 insertions(+)

diff --git a/src/tools/action_parse/main.cpp b/src/tools/action_parse/main.cpp
index c542eae7f5..dee585cc42 100644
--- a/src/tools/action_parse/main.cpp
+++ b/src/tools/action_parse/main.cpp
@@ -40,6 +40,7 @@ struct StatusModifier
 struct StatusEntry
 {
   uint16_t id;
+  int32_t duration;
   std::vector< StatusModifier > modifiers;
 };
 
@@ -76,6 +77,7 @@ void to_json( nlohmann::ordered_json& j, const StatusEntry& statusEntry )
 {
   j = nlohmann::ordered_json{
     { "id", statusEntry.id },
+    { "duration", statusEntry.duration },
     { "modifiers", statusEntry.modifiers }
   };
 }
diff --git a/src/world/Action/ActionLut.h b/src/world/Action/ActionLut.h
index 3ea20cdba2..bd0fbe3ff0 100644
--- a/src/world/Action/ActionLut.h
+++ b/src/world/Action/ActionLut.h
@@ -17,6 +17,7 @@ namespace Sapphire::World::Action
   struct StatusEntry
   {
     uint16_t id;
+    int32_t duration;
     std::vector< StatusModifier > modifiers;
   };
 
diff --git a/src/world/Action/ActionLutData.h b/src/world/Action/ActionLutData.h
index 61225af687..99e78f0326 100644
--- a/src/world/Action/ActionLutData.h
+++ b/src/world/Action/ActionLutData.h
@@ -32,6 +32,7 @@ namespace Sapphire::World::Action
   inline void from_json( const nlohmann::json& j, StatusEntry& statusEntry )
   {
     j.at( "id" ).get_to( statusEntry.id );
+    j.at( "duration" ).get_to( statusEntry.duration );
     if( j.contains( "modifiers" ) )
       j.at( "modifiers" ).get_to( statusEntry.modifiers );
   }

From 65ad14a475607b4f8d7899e25487306b0f66f026 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Mon, 6 Mar 2023 23:08:01 +0100
Subject: [PATCH 03/45] Rename buildEffects to make more sense

---
 src/world/Action/Action.cpp | 4 ++--
 src/world/Action/Action.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index c522015d6b..4d4355703d 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -431,7 +431,7 @@ void Action::Action::execute()
 
   if( !hasClientsideTarget()  )
   {
-    buildEffects();
+    handleAction();
   }
   else if( auto player = m_pSource->getAsPlayer() )
   {
@@ -501,7 +501,7 @@ std::pair< uint32_t, Common::ActionHitSeverityType > Action::Action::calcHealing
   return Math::CalcStats::calcActionHealing( *m_pSource, potency, wepDmg );
 }
 
-void Action::Action::buildEffects()
+void Action::Action::handleAction()
 {
   snapshotAffectedActors( m_hitActors );
 
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index 044681155a..49d4cff26a 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -105,7 +105,7 @@ namespace Sapphire::World::Action
 
     EffectBuilderPtr getEffectbuilder();
 
-    void buildEffects();
+    void handleAction();
 
     /*!
      * @brief Adds an actor filter to this action.

From 0cd43df30502b2a9d3a04f57dc949dc5763676ff Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Mon, 6 Mar 2023 23:09:03 +0100
Subject: [PATCH 04/45] Add basic generic handler for applying statuseffects

---
 src/world/Action/Action.cpp | 31 +++++++++++++++++++++++++++++++
 src/world/Action/Action.h   |  2 ++
 2 files changed, 33 insertions(+)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 4d4355703d..0da5b41f96 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -533,6 +533,8 @@ void Action::Action::handleAction()
     Manager::PlayerMgr::sendDebug( *player, "Hit target: pot: {} (c: {}, f: {}, r: {}), heal pot: {}, mpp: {}",
                                    m_lutEntry.potency, m_lutEntry.comboPotency, m_lutEntry.flankPotency, m_lutEntry.rearPotency,
                                    m_lutEntry.curePotency, m_lutEntry.restoreMPPercentage );
+    if( m_lutEntry.statuses.caster.size() > 0 || m_lutEntry.statuses.target.size() > 0 )
+      handleStatusEffects();
   }
 
   // when aoe, these effects are in the target whatever is hit first
@@ -600,6 +602,35 @@ void Action::Action::handleAction()
   // m_effectBuilder.reset();
 }
 
+void Action::Action::handleStatusEffects()
+{
+  // handle caster statuses
+  if( m_lutEntry.statuses.caster.size() > 0 )
+  {
+    for( auto& status : m_lutEntry.statuses.caster )
+    {
+      getEffectbuilder()->applyStatusEffect( m_pSource, status.id, 0 );
+      m_pSource->addStatusEffectByIdIfNotExist( status.id, status.duration, *m_pSource, status.modifiers );
+    }
+  }
+
+  // handle hit actor statuses
+  if( m_lutEntry.statuses.target.size() > 0 && m_hitActors.size() > 0 )
+  {
+    for( auto& actor : m_hitActors )
+    {
+      for( auto& status : m_lutEntry.statuses.target )
+      {
+        getEffectbuilder()->applyStatusEffect( actor, status.id, 0 );
+        actor->addStatusEffectByIdIfNotExist( status.id, status.duration, *m_pSource, status.modifiers );
+      }
+
+      if( actor->getStatusEffectMap().size() > 0 )
+        actor->onActionHostile( m_pSource );
+    }
+  }
+}
+
 bool Action::Action::preCheck()
 {
   if( auto player = m_pSource->getAsPlayer() )
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index 49d4cff26a..77a139dc8b 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -107,6 +107,8 @@ namespace Sapphire::World::Action
 
     void handleAction();
 
+    void handleStatusEffects();
+
     /*!
      * @brief Adds an actor filter to this action.
      * @param filter The ptr to the ActorFilter to add

From ed4104c83e08aca387838cad63fc8795b4b37eda Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Mon, 6 Mar 2023 23:11:50 +0100
Subject: [PATCH 05/45] Add more modifiers

---
 src/common/Common.h                | 40 ++++++++++++++++++------------
 src/world/Action/ActionLutData.cpp |  8 ++++++
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 72e14d21f5..f1790f5b4b 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -887,22 +887,30 @@ namespace Sapphire::Common
     Perception = 73,
 
     // Unique modifiers
-    HPPercent = 1000,
-    MPPercent = 1001,
-    TPPercent = 1002,
-    GPPercent = 1003,
-    CPPercent = 1004,
-    PhysicalDamagePercent = 1005,
-    MagicDamagePercent = 1006,
-    AttackPowerPercent = 1007,
-    DefensePercent = 1008,
-    AccuracyPercent = 1009,
-    EvasionPercent = 1010,
-    MagicDefensePercent = 1011,
-    CriticalHitPowerPercent = 1012,
-    CriticalHitResiliencePercent = 1013,
-    CriticalHitPercent = 1014,
-    EnmityPercent = 1015
+    TickHeal = 1000,
+    TickDamage = 1001,
+    StrengthPercent = 1002,
+    DexterityPercent = 1003,
+    VitalityPercent = 1004,
+    IntelligencePercent = 1005,
+    MindPercent = 1006,
+    PietyPercent = 1007,
+    HPPercent = 1008,
+    MPPercent = 1009,
+    TPPercent = 1010,
+    GPPercent = 1011,
+    CPPercent = 1012,
+    PhysicalDamagePercent = 1013,
+    MagicDamagePercent = 1014,
+    AttackPowerPercent = 1015,
+    DefensePercent = 1016,
+    AccuracyPercent = 1017,
+    EvasionPercent = 1018,
+    MagicDefensePercent = 1019,
+    CriticalHitPowerPercent = 1020,
+    CriticalHitResiliencePercent = 1021,
+    CriticalHitPercent = 1022,
+    EnmityPercent = 1023
   };
 
   enum struct ActionAspect : uint8_t
diff --git a/src/world/Action/ActionLutData.cpp b/src/world/Action/ActionLutData.cpp
index 99ee9b738b..9e4c7bcdb5 100644
--- a/src/world/Action/ActionLutData.cpp
+++ b/src/world/Action/ActionLutData.cpp
@@ -85,6 +85,14 @@ std::unordered_map< std::string, Common::ParamModifier > ActionLutData::m_modifi
   { "Control", Common::ParamModifier::Control },
   { "Gathering", Common::ParamModifier::Gathering },
   { "Perception", Common::ParamModifier::Perception },
+  { "TickHeal", Common::ParamModifier::TickHeal },
+  { "TickDamage", Common::ParamModifier::TickDamage },
+  { "StrengthPercent", Common::ParamModifier::StrengthPercent },
+  { "DexterityPercent", Common::ParamModifier::DexterityPercent },
+  { "VitalityPercent", Common::ParamModifier::VitalityPercent },
+  { "IntelligencePercent", Common::ParamModifier::IntelligencePercent },
+  { "MindPercent", Common::ParamModifier::MindPercent },
+  { "PietyPercent", Common::ParamModifier::PietyPercent },
   { "HPPercent", Common::ParamModifier::HPPercent },
   { "MPPercent", Common::ParamModifier::MPPercent },
   { "TPPercent", Common::ParamModifier::TPPercent },

From dd20478a015dfc74a8100a1f2da02091d59b06db Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Mon, 6 Mar 2023 23:06:59 +0100
Subject: [PATCH 06/45] Add basic modifier impl for Chara

---
 src/world/Actor/Chara.cpp | 54 +++++++++++++++++++++++++++++++++++++--
 src/world/Actor/Chara.h   | 12 ++++++++-
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 23f652b5d1..66f8ef46f7 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -5,7 +5,6 @@
 #include <Network/CommonActorControl.h>
 #include <Service.h>
 
-
 #include "Forwards.h"
 
 #include "Territory/Territory.h"
@@ -26,6 +25,7 @@
 #include "Player.h"
 #include "Manager/TerritoryMgr.h"
 #include "Manager/MgrUtil.h"
+#include "Manager/PlayerMgr.h"
 #include "Common.h"
 
 using namespace Sapphire::Common;
@@ -559,7 +559,17 @@ void Sapphire::Entity::Chara::addStatusEffectByIdIfNotExist( uint32_t id, int32_
   auto effect = StatusEffect::make_StatusEffect( id, source.getAsChara(), getAsChara(), duration, 3000 );
   effect->setParam( param );
   addStatusEffect( effect );
+}
+
+void Sapphire::Entity::Chara::addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Chara& source,
+                                                             std::vector< World::Action::StatusModifier >& modifiers, uint16_t param )
+{
+  if( hasStatusEffect( id ) )
+    return;
 
+  auto effect = StatusEffect::make_StatusEffect( id, source.getAsChara(), getAsChara(), duration, modifiers, 3000 );
+  effect->setParam( param );
+  addStatusEffect( effect );
 }
 
 int8_t Sapphire::Entity::Chara::getStatusEffectFreeSlot()
@@ -644,7 +654,6 @@ void Sapphire::Entity::Chara::sendStatusEffectUpdate()
 {
   uint64_t currentTimeMs = Util::getTimeMs();
 
-
   auto statusEffectList = makeZonePacket< FFXIVIpcStatus >( getId() );
   uint8_t slot = 0;
   for( const auto& effectIt : m_statusEffectMap )
@@ -785,6 +794,47 @@ void Sapphire::Entity::Chara::setStatValue( Common::BaseParam baseParam, uint32_
   m_baseStats[ index ] = value;
 }
 
+float Sapphire::Entity::Chara::getModifier( Common::ParamModifier paramModifier ) const
+{
+  if( m_modifiers.find( paramModifier ) == m_modifiers.end() )
+    return paramModifier >= Common::ParamModifier::StrengthPercent ? 1.0f : 0;
+
+  auto& mod = m_modifiers.at( paramModifier );
+  if( paramModifier >= Common::ParamModifier::StrengthPercent )
+  {
+    auto valPercent = 1.0f;
+    for( const auto val : mod )
+      valPercent *= 1.0f + ( val / 100.0f );
+    return valPercent;
+  }
+  else
+  {
+    return std::accumulate( mod.begin(), mod.end(), 0 );
+  }
+}
+
+void Sapphire::Entity::Chara::addModifier( Common::ParamModifier paramModifier, int32_t value )
+{
+  m_modifiers[ paramModifier ].push_back( value );
+
+  if( auto pPlayer = this->getAsPlayer(); pPlayer )
+    Common::Service< World::Manager::PlayerMgr >::ref().sendDebug( *pPlayer, "Modifier: {}, value: {}", static_cast< int32_t >( paramModifier ), getModifier( paramModifier ) );
+}
+
+void Sapphire::Entity::Chara::delModifier( Common::ParamModifier paramModifier, int32_t value )
+{
+  assert( m_modifiers.count( paramModifier ) != 0 );
+  auto& mod = m_modifiers.at( paramModifier );
+
+  mod.erase( std::remove( mod.begin(), mod.end(), value ), mod.end() );
+
+  if( mod.size() == 0 )
+    m_modifiers.erase( paramModifier );
+
+  if( auto pPlayer = this->getAsPlayer(); pPlayer )
+    Common::Service< World::Manager::PlayerMgr >::ref().sendDebug( *pPlayer, "Modifier: {}, value: {}", static_cast< int32_t >( paramModifier ), getModifier( paramModifier ) );
+}
+
 void Sapphire::Entity::Chara::onTick()
 {
   uint32_t thisTickDmg = 0;
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index 20449f16c8..dab108a672 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Common.h>
+#include "Action/ActionLut.h"
 
 #include "Forwards.h"
 #include "GameObject.h"
@@ -26,10 +27,13 @@ namespace Sapphire::Entity
   public:
 
     using ActorStatsArray = std::array< uint32_t, STAT_ARRAY_SIZE >;
+    using ActorModifiersMap = std::unordered_map< Common::ParamModifier, std::vector< int32_t > >;
 
     ActorStatsArray m_baseStats{ 0 };
     ActorStatsArray m_bonusStats{ 0 };
 
+    ActorModifiersMap m_modifiers{ 0 };
+
   protected:
     char m_name[34];
     /*! Last tick time for the actor  ( in ms ) */
@@ -133,9 +137,9 @@ namespace Sapphire::Entity
 
     // add a status effect by id
     void addStatusEffectById( uint32_t id, int32_t duration, Entity::Chara& source, uint16_t param = 0 );
-
     // add a status effect by id if it doesn't exist
     void addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Chara& source, uint16_t param = 0 );
+    void addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Chara& source, std::vector< World::Action::StatusModifier >& modifiers, uint16_t param = 0 );
 
     // remove a status effect by id
     void removeSingleStatusEffectFromId( uint32_t id );
@@ -159,6 +163,12 @@ namespace Sapphire::Entity
 
     void setStatValue( Common::BaseParam baseParam, uint32_t value );
 
+    float getModifier( Common::ParamModifier paramModifier ) const;
+
+    void addModifier( Common::ParamModifier paramModifier, int32_t value );
+
+    void delModifier( Common::ParamModifier paramModifier, int32_t value );
+
     uint32_t getHp() const;
 
     uint32_t getHpPercent() const;

From c15ac9031a69369a06ff66da9f1340494be6f830 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Mon, 6 Mar 2023 23:13:45 +0100
Subject: [PATCH 07/45] Apply/remove modifiers for statuseffects

---
 src/world/StatusEffect/StatusEffect.cpp | 26 +++++++++++++++++++++++++
 src/world/StatusEffect/StatusEffect.h   |  6 +++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/world/StatusEffect/StatusEffect.cpp b/src/world/StatusEffect/StatusEffect.cpp
index 1b371938c4..064c2119e3 100644
--- a/src/world/StatusEffect/StatusEffect.cpp
+++ b/src/world/StatusEffect/StatusEffect.cpp
@@ -17,12 +17,20 @@ using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
 //using namespace Sapphire::Network::Packets::WorldPackets::Server;
 
+Sapphire::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor,
+                                                    uint32_t duration, std::vector< World::Action::StatusModifier >& modifiers, uint32_t tickRate ) :
+  StatusEffect( id, sourceActor, targetActor, duration, tickRate )
+{
+  m_modifiers = std::move( modifiers );
+}
+
 Sapphire::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor,
                                                     uint32_t duration, uint32_t tickRate ) :
   m_id( id ),
   m_sourceActor( sourceActor ),
   m_targetActor( targetActor ),
   m_duration( duration ),
+  m_modifiers( 0 ),
   m_startTime( 0 ),
   m_tickRate( tickRate ),
   m_lastTick( 0 )
@@ -87,6 +95,15 @@ void Sapphire::StatusEffect::StatusEffect::applyStatus()
   m_startTime = Util::getTimeMs();
   auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
 
+  for( const auto& mod : m_modifiers )
+  {
+    // TODO: ticks
+    if( mod.modifier != Common::ParamModifier::TickDamage && mod.modifier != Common::ParamModifier::TickHeal )
+      m_targetActor->addModifier( mod.modifier, mod.value );
+  }
+
+  m_targetActor->calculateStats();
+
   // this is only right when an action is being used by the player
   // else you probably need to use an actorcontrol
 
@@ -111,6 +128,15 @@ void Sapphire::StatusEffect::StatusEffect::applyStatus()
 void Sapphire::StatusEffect::StatusEffect::removeStatus()
 {
   auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+
+  for( const auto& mod : m_modifiers )
+  {
+    if( mod.modifier != Common::ParamModifier::TickDamage && mod.modifier != Common::ParamModifier::TickHeal )
+      m_targetActor->delModifier( mod.modifier, mod.value );
+  }
+
+  m_targetActor->calculateStats();
+
   scriptMgr.onStatusTimeOut( m_targetActor, m_id );
 }
 
diff --git a/src/world/StatusEffect/StatusEffect.h b/src/world/StatusEffect/StatusEffect.h
index e6bb1c8e43..bc8e4f4717 100644
--- a/src/world/StatusEffect/StatusEffect.h
+++ b/src/world/StatusEffect/StatusEffect.h
@@ -2,6 +2,7 @@
 #define _STATUSEFFECT_H_
 
 #include "Forwards.h"
+#include "Action/ActionLut.h"
 
 namespace Sapphire {
 namespace StatusEffect {
@@ -10,6 +11,9 @@ namespace StatusEffect {
 class StatusEffect
 {
 public:
+  StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor,
+                uint32_t duration, std::vector< World::Action::StatusModifier >& modifiers, uint32_t tickRate );
+
   StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor,
                 uint32_t duration, uint32_t tickRate );
 
@@ -58,7 +62,7 @@ class StatusEffect
   uint16_t m_param;
   std::string m_name;
   std::pair< uint8_t, uint32_t > m_currTickEffect;
-
+  std::vector< World::Action::StatusModifier > m_modifiers;
 };
 
 }

From 5386f1334f422216ca063a9c0e7e5e833e1ab5f5 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Tue, 21 Feb 2023 20:08:55 +0100
Subject: [PATCH 08/45] Add some example statuses to lut

---
 data/actions/player.json | 85 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 80 insertions(+), 5 deletions(-)

diff --git a/data/actions/player.json b/data/actions/player.json
index 149d05aae9..6d6dfac3b6 100644
--- a/data/actions/player.json
+++ b/data/actions/player.json
@@ -398,7 +398,18 @@
     "restorePercentage": 0,
     "nextCombo": [],
     "statuses": {
-      "caster": [],
+      "caster": [
+        {
+          "id": 83,
+          "duration": 20000,
+          "modifiers": [
+            {
+              "modifier": "DefensePercent",
+              "value": 20
+            }
+          ]
+        }
+      ],
       "target": []
     }
   },
@@ -414,7 +425,18 @@
     "nextCombo": [],
     "statuses": {
       "caster": [],
-      "target": []
+      "target": [
+        {
+          "id": 244,
+          "duration": 30000,
+          "modifiers": [
+            {
+              "modifier": "TickDamage",
+              "value": 20
+            }
+          ]
+        }
+      ]
     }
   },
   "34": {
@@ -493,7 +515,18 @@
     "restorePercentage": 0,
     "nextCombo": [],
     "statuses": {
-      "caster": [],
+      "caster": [
+        {
+          "id": 86,
+          "duration": 20000,
+          "modifiers": [
+            {
+              "modifier": "AttackPowerPercent",
+              "value": 50
+            }
+          ]
+        }
+      ],
       "target": []
     }
   },
@@ -523,7 +556,18 @@
     "restorePercentage": 0,
     "nextCombo": [],
     "statuses": {
-      "caster": [],
+      "caster": [
+        {
+          "id": 87,
+          "duration": 20000,
+          "modifiers": [
+            {
+              "modifier": "HPPercent",
+              "value": 20
+            }
+          ]
+        }
+      ],
       "target": []
     }
   },
@@ -2454,7 +2498,38 @@
     "nextCombo": [],
     "statuses": {
       "caster": [],
-      "target": []
+      "target": [
+        {
+          "id": 180,
+          "duration": 24000,
+          "modifiers": [
+            {
+              "modifier": "TickDamage",
+              "value": 35
+            }
+          ]
+        },
+        {
+          "id": 191,
+          "duration": 24000,
+          "modifiers": [
+            {
+              "modifier": "HealingRecoveryPercent",
+              "value": -20
+            }
+          ]
+        },
+        {
+          "id": 240,
+          "duration": 24000,
+          "modifiers": [
+            {
+              "modifier": "HeavyPercent",
+              "value": 40
+            }
+          ]
+        }
+      ]
     }
   },
   "169": {

From b94e7f4b2fd3be30941be67694247bff0fe6a909 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Mon, 6 Mar 2023 23:57:06 +0100
Subject: [PATCH 09/45] Fix windows build error

---
 src/world/Actor/Chara.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index dab108a672..a5c4de9c9d 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -9,6 +9,7 @@
 #include <map>
 #include <queue>
 #include <array>
+#include <numeric>
 
 namespace Sapphire::Entity
 {

From b3098fec8732f1026033feac6e532311ca400320 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Tue, 21 Feb 2023 20:11:17 +0100
Subject: [PATCH 10/45] Don't clear tick effect

---
 src/world/StatusEffect/StatusEffect.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/world/StatusEffect/StatusEffect.cpp b/src/world/StatusEffect/StatusEffect.cpp
index 064c2119e3..da827fe73b 100644
--- a/src/world/StatusEffect/StatusEffect.cpp
+++ b/src/world/StatusEffect/StatusEffect.cpp
@@ -62,9 +62,7 @@ void Sapphire::StatusEffect::StatusEffect::registerTickEffect( uint8_t type, uin
 
 std::pair< uint8_t, uint32_t > Sapphire::StatusEffect::StatusEffect::getTickEffect()
 {
-  auto thisTick = m_currTickEffect;
-  m_currTickEffect = std::make_pair( 0, 0 );
-  return thisTick;
+  return m_currTickEffect;
 }
 
 void Sapphire::StatusEffect::StatusEffect::onTick()

From b5254956363d2993cb7ce12cf43d193094dc774a Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Tue, 7 Mar 2023 19:57:14 +0100
Subject: [PATCH 11/45] Add status entry for Maim

---
 data/actions/player.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/data/actions/player.json b/data/actions/player.json
index 6d6dfac3b6..15370c57ea 100644
--- a/data/actions/player.json
+++ b/data/actions/player.json
@@ -500,7 +500,18 @@
       45
     ],
     "statuses": {
-      "caster": [],
+      "caster": [
+        {
+          "id": 85,
+          "duration": 24000,
+          "modifiers": [
+            {
+              "modifier": "AttackPowerPercent",
+              "value": 20
+            }
+          ]
+        }
+      ],
       "target": []
     }
   },

From bfaec90e00a65edffe368f9e1d89a3d3c5284e4d Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Tue, 7 Mar 2023 19:58:08 +0100
Subject: [PATCH 12/45] Apply status effects properly for self when having a
 target

---
 src/world/Action/Action.cpp        | 13 ++++++++++---
 src/world/Action/EffectBuilder.cpp |  4 ++--
 src/world/Action/EffectBuilder.h   |  2 +-
 src/world/Action/EffectResult.cpp  |  6 ++++--
 src/world/Action/EffectResult.h    |  2 +-
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 0da5b41f96..ff610cdbb1 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -533,8 +533,6 @@ void Action::Action::handleAction()
     Manager::PlayerMgr::sendDebug( *player, "Hit target: pot: {} (c: {}, f: {}, r: {}), heal pot: {}, mpp: {}",
                                    m_lutEntry.potency, m_lutEntry.comboPotency, m_lutEntry.flankPotency, m_lutEntry.rearPotency,
                                    m_lutEntry.curePotency, m_lutEntry.restoreMPPercentage );
-    if( m_lutEntry.statuses.caster.size() > 0 || m_lutEntry.statuses.target.size() > 0 )
-      handleStatusEffects();
   }
 
   // when aoe, these effects are in the target whatever is hit first
@@ -595,6 +593,9 @@ void Action::Action::handleAction()
     }
   }
 
+  if( m_lutEntry.statuses.caster.size() > 0 || m_lutEntry.statuses.target.size() > 0 )
+    handleStatusEffects();
+
   m_effectBuilder->buildAndSendPackets( m_hitActors );
 
   // TODO: disabled, reset kills our queued actions
@@ -604,12 +605,18 @@ void Action::Action::handleAction()
 
 void Action::Action::handleStatusEffects()
 {
+  if( isComboAction() && !isCorrectCombo() )
+    return;
+
   // handle caster statuses
   if( m_lutEntry.statuses.caster.size() > 0 )
   {
     for( auto& status : m_lutEntry.statuses.caster )
     {
-      getEffectbuilder()->applyStatusEffect( m_pSource, status.id, 0 );
+      if( m_hitActors.size() > 0 )
+        getEffectbuilder()->applyStatusEffect( m_pSource, status.id, 0, true );
+      else
+        getEffectbuilder()->applyStatusEffect( m_pSource, status.id, 0 );
       m_pSource->addStatusEffectByIdIfNotExist( status.id, status.duration, *m_pSource, status.modifiers );
     }
   }
diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp
index 1770e8c686..dd5bae9eb2 100644
--- a/src/world/Action/EffectBuilder.cpp
+++ b/src/world/Action/EffectBuilder.cpp
@@ -93,10 +93,10 @@ void EffectBuilder::comboSucceed( Entity::CharaPtr& target )
   addResultToActor( target, nextResult );
 }
 
-void EffectBuilder::applyStatusEffect( Entity::CharaPtr& target, uint16_t statusId, uint8_t param )
+void EffectBuilder::applyStatusEffect( Entity::CharaPtr& target, uint16_t statusId, uint8_t param, bool forSelf )
 {
   EffectResultPtr nextResult = make_EffectResult( target, 0 );
-  nextResult->applyStatusEffect( statusId, param );
+  nextResult->applyStatusEffect( statusId, param, forSelf );
   addResultToActor( target, nextResult );
 }
 
diff --git a/src/world/Action/EffectBuilder.h b/src/world/Action/EffectBuilder.h
index 705690a814..c0711cf2c8 100644
--- a/src/world/Action/EffectBuilder.h
+++ b/src/world/Action/EffectBuilder.h
@@ -25,7 +25,7 @@ namespace Sapphire::World::Action
 
     void comboSucceed( Entity::CharaPtr& target );
 
-    void applyStatusEffect( Entity::CharaPtr& target, uint16_t statusId, uint8_t param );
+    void applyStatusEffect( Entity::CharaPtr& target, uint16_t statusId, uint8_t param, bool forSelf = false );
 
     void mount( Entity::CharaPtr& target, uint16_t mountId );
 
diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp
index 8ef9d68f62..9de97df307 100644
--- a/src/world/Action/EffectResult.cpp
+++ b/src/world/Action/EffectResult.cpp
@@ -70,11 +70,13 @@ void EffectResult::comboSucceed()
   m_result.Type = Common::ActionEffectType::CALC_RESULT_TYPE_COMBO_HIT;
 }
 
-void EffectResult::applyStatusEffect( uint16_t statusId, uint8_t param )
+void EffectResult::applyStatusEffect( uint16_t statusId, uint8_t param, bool forSelf )
 {
   m_result.Value = static_cast< int16_t >( statusId );
   m_result.Arg2 = param;
-  m_result.Type = Common::ActionEffectType::CALC_RESULT_TYPE_SET_STATUS;
+  if( forSelf )
+    m_result.Flag = static_cast< uint8_t >( Common::ActionEffectResultFlag::EffectOnSource );
+  m_result.Type = forSelf ? Common::ActionEffectType::CALC_RESULT_TYPE_SET_STATUS_ME : Common::ActionEffectType::CALC_RESULT_TYPE_SET_STATUS;
 }
 
 void EffectResult::mount( uint16_t mountId )
diff --git a/src/world/Action/EffectResult.h b/src/world/Action/EffectResult.h
index 38ca2b7a26..48d43c718a 100644
--- a/src/world/Action/EffectResult.h
+++ b/src/world/Action/EffectResult.h
@@ -19,7 +19,7 @@ namespace Sapphire::World::Action
     void restoreMP( uint32_t amount, Common::ActionEffectResultFlag flag = Common::ActionEffectResultFlag::None );
     void startCombo( uint16_t actionId );
     void comboSucceed();
-    void applyStatusEffect( uint16_t statusId, uint8_t param );
+    void applyStatusEffect( uint16_t statusId, uint8_t param, bool forSelf );
     void mount( uint16_t mountId );
 
     Entity::CharaPtr getTarget() const;

From 7ad9f9687e8a435f83ef8c01545430a9f7bc0ace Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Tue, 7 Mar 2023 19:59:11 +0100
Subject: [PATCH 13/45] Fix hasStatusEffect to prevent duplicates

---
 src/world/Actor/Chara.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 66f8ef46f7..bb383efb1d 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -698,7 +698,13 @@ void Sapphire::Entity::Chara::updateStatusEffects()
 
 bool Sapphire::Entity::Chara::hasStatusEffect( uint32_t id )
 {
-  return m_statusEffectMap.find( id ) != m_statusEffectMap.end();
+  for( const auto& [ key, val ] : m_statusEffectMap )
+  {
+    if( val->getId() == id )
+      return true;
+  }
+
+  return false;
 }
 
 int64_t Sapphire::Entity::Chara::getLastUpdateTime() const

From 51b7740a6fde785bc3eeab466e8f400c38607f95 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Tue, 7 Mar 2023 20:00:32 +0100
Subject: [PATCH 14/45] Basic dot/hot ticks implemented

---
 src/world/Actor/Chara.cpp               | 4 ++--
 src/world/StatusEffect/StatusEffect.cpp | 8 ++++++--
 src/world/StatusEffect/StatusEffect.h   | 6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index bb383efb1d..60936608ef 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -851,13 +851,13 @@ void Sapphire::Entity::Chara::onTick()
     auto thisEffect = effectIt.second->getTickEffect();
     switch( thisEffect.first )
     {
-      case 1:
+      case Common::ParamModifier::TickDamage:
       {
         thisTickDmg += thisEffect.second;
         break;
       }
 
-      case 2:
+      case Common::ParamModifier::TickHeal:
       {
         thisTickHeal += thisEffect.second;
         break;
diff --git a/src/world/StatusEffect/StatusEffect.cpp b/src/world/StatusEffect/StatusEffect.cpp
index da827fe73b..b31a082949 100644
--- a/src/world/StatusEffect/StatusEffect.cpp
+++ b/src/world/StatusEffect/StatusEffect.cpp
@@ -55,12 +55,12 @@ Sapphire::StatusEffect::StatusEffect::~StatusEffect()
 {
 }
 
-void Sapphire::StatusEffect::StatusEffect::registerTickEffect( uint8_t type, uint32_t param )
+void Sapphire::StatusEffect::StatusEffect::registerTickEffect( ParamModifier type, uint32_t param )
 {
   m_currTickEffect = std::make_pair( type, param );
 }
 
-std::pair< uint8_t, uint32_t > Sapphire::StatusEffect::StatusEffect::getTickEffect()
+std::pair< ParamModifier, uint32_t > Sapphire::StatusEffect::StatusEffect::getTickEffect()
 {
   return m_currTickEffect;
 }
@@ -98,6 +98,10 @@ void Sapphire::StatusEffect::StatusEffect::applyStatus()
     // TODO: ticks
     if( mod.modifier != Common::ParamModifier::TickDamage && mod.modifier != Common::ParamModifier::TickHeal )
       m_targetActor->addModifier( mod.modifier, mod.value );
+    else if( mod.modifier == Common::ParamModifier::TickDamage )
+      registerTickEffect( mod.modifier, mod.value );
+    else if( mod.modifier == Common::ParamModifier::TickHeal )
+      registerTickEffect( mod.modifier, mod.value );
   }
 
   m_targetActor->calculateStats();
diff --git a/src/world/StatusEffect/StatusEffect.h b/src/world/StatusEffect/StatusEffect.h
index bc8e4f4717..f18ecbcfe5 100644
--- a/src/world/StatusEffect/StatusEffect.h
+++ b/src/world/StatusEffect/StatusEffect.h
@@ -45,9 +45,9 @@ class StatusEffect
 
   void setParam( uint16_t param );
 
-  void registerTickEffect( uint8_t type, uint32_t param );
+  void registerTickEffect( Common::ParamModifier type, uint32_t param );
 
-  std::pair< uint8_t, uint32_t > getTickEffect();
+  std::pair< Common::ParamModifier, uint32_t > getTickEffect();
 
   const std::string& getName() const;
 
@@ -61,7 +61,7 @@ class StatusEffect
   uint64_t m_lastTick;
   uint16_t m_param;
   std::string m_name;
-  std::pair< uint8_t, uint32_t > m_currTickEffect;
+  std::pair< Common::ParamModifier, uint32_t > m_currTickEffect;
   std::vector< World::Action::StatusModifier > m_modifiers;
 };
 

From 78acb58d8f5b580c78bf8a8d3e9d837efedb30b1 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Tue, 7 Mar 2023 20:03:43 +0100
Subject: [PATCH 15/45] Update HP on tick effects

---
 src/world/Actor/Chara.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 60936608ef..a135f1e910 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -865,12 +865,18 @@ void Sapphire::Entity::Chara::onTick()
     }
   }
 
+  // TODO: don't really like how this is handled
+  // TODO: calculate actual damage from potency
   if( thisTickDmg != 0 )
   {
     takeDamage( thisTickDmg );
     server().queueForPlayers( getInRangePlayerIds( isPlayer() ), makeActorControl( getId(), HPFloatingText, 0,
                                                                                    static_cast< uint8_t >( ActionEffectType::CALC_RESULT_TYPE_DAMAGE_HP ),
                                                                                    thisTickDmg ) );
+    if( isPlayer() )
+      server().queueForPlayers( getInRangePlayerIds( isPlayer() ), makeHudParam( *getAsPlayer() ) );
+    else if( isBattleNpc() )
+      server().queueForPlayers( getInRangePlayerIds( isPlayer() ), makeHudParam( *getAsBNpc() ) );
   }
 
   if( thisTickHeal != 0 )
@@ -879,5 +885,9 @@ void Sapphire::Entity::Chara::onTick()
     server().queueForPlayers( getInRangePlayerIds( isPlayer() ), makeActorControl( getId(), HPFloatingText, 0,
                                                                                    static_cast< uint8_t >( ActionEffectType::CALC_RESULT_TYPE_RECOVER_HP ),
                                                                                    thisTickHeal ) );
+    if( isPlayer() )
+      server().queueForPlayers( getInRangePlayerIds( isPlayer() ), makeHudParam( *getAsPlayer() ) );
+    else if( isBattleNpc() )
+      server().queueForPlayers( getInRangePlayerIds( isPlayer() ), makeHudParam( *getAsBNpc() ) );
   }
 }
\ No newline at end of file

From 6fce046225d4ff11117227b19b89adea321a8d57 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Tue, 7 Mar 2023 23:05:18 +0100
Subject: [PATCH 16/45] Apply effect to correct target

---
 src/world/Action/Action.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index ff610cdbb1..ae213bb7d4 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -614,7 +614,7 @@ void Action::Action::handleStatusEffects()
     for( auto& status : m_lutEntry.statuses.caster )
     {
       if( m_hitActors.size() > 0 )
-        getEffectbuilder()->applyStatusEffect( m_pSource, status.id, 0, true );
+        getEffectbuilder()->applyStatusEffect( m_hitActors[ 0 ], status.id, 0, true );
       else
         getEffectbuilder()->applyStatusEffect( m_pSource, status.id, 0 );
       m_pSource->addStatusEffectByIdIfNotExist( status.id, status.duration, *m_pSource, status.modifiers );

From 6cbf94d9c20e4b38fd478edf69c679802d0d1b60 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Wed, 8 Mar 2023 00:34:36 +0100
Subject: [PATCH 17/45] Add method to simplify applying statuses to self

---
 src/world/Action/Action.cpp | 13 +++++++++----
 src/world/Action/Action.h   |  2 ++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index ae213bb7d4..1b4faff62e 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -501,6 +501,14 @@ std::pair< uint32_t, Common::ActionHitSeverityType > Action::Action::calcHealing
   return Math::CalcStats::calcActionHealing( *m_pSource, potency, wepDmg );
 }
 
+void Action::Action::applyStatusEffectSelf( uint16_t statusId, uint8_t param )
+{
+  if( m_hitActors.size() > 0 )
+    getEffectbuilder()->applyStatusEffect( m_hitActors[ 0 ], statusId, param, true );
+  else
+    getEffectbuilder()->applyStatusEffect( m_pSource, statusId, param );
+}
+
 void Action::Action::handleAction()
 {
   snapshotAffectedActors( m_hitActors );
@@ -613,10 +621,7 @@ void Action::Action::handleStatusEffects()
   {
     for( auto& status : m_lutEntry.statuses.caster )
     {
-      if( m_hitActors.size() > 0 )
-        getEffectbuilder()->applyStatusEffect( m_hitActors[ 0 ], status.id, 0, true );
-      else
-        getEffectbuilder()->applyStatusEffect( m_pSource, status.id, 0 );
+      applyStatusEffectSelf( status.id );
       m_pSource->addStatusEffectByIdIfNotExist( status.id, status.duration, *m_pSource, status.modifiers );
     }
   }
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index 77a139dc8b..f6f18304f7 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -105,6 +105,8 @@ namespace Sapphire::World::Action
 
     EffectBuilderPtr getEffectbuilder();
 
+    void applyStatusEffectSelf( uint16_t statusId, uint8_t param = 0 );
+
     void handleAction();
 
     void handleStatusEffects();

From aaad18bf7b444730bea2189fe6b3a82e8d320d6b Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Wed, 8 Mar 2023 18:07:15 +0100
Subject: [PATCH 18/45] Add job actions for warrior

---
 src/world/Action/Action.cpp      | 16 +++++++++
 src/world/Action/Action.h        |  2 ++
 src/world/Action/Job/Warrior.cpp | 61 ++++++++++++++++++++++++++++++++
 src/world/Action/Job/Warrior.h   | 20 +++++++++++
 src/world/CMakeLists.txt         |  1 +
 5 files changed, 100 insertions(+)
 create mode 100644 src/world/Action/Job/Warrior.cpp
 create mode 100644 src/world/Action/Job/Warrior.h

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 1b4faff62e..e2ff4b2737 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -31,6 +31,8 @@
 #include <Service.h>
 #include "WorldServer.h"
 
+#include "Job/Warrior.h"
+
 using namespace Sapphire;
 using namespace Sapphire::Common;
 using namespace Sapphire::Network;
@@ -604,6 +606,8 @@ void Action::Action::handleAction()
   if( m_lutEntry.statuses.caster.size() > 0 || m_lutEntry.statuses.target.size() > 0 )
     handleStatusEffects();
 
+  handleJobAction();
+
   m_effectBuilder->buildAndSendPackets( m_hitActors );
 
   // TODO: disabled, reset kills our queued actions
@@ -643,6 +647,18 @@ void Action::Action::handleStatusEffects()
   }
 }
 
+void Action::Action::handleJobAction()
+{
+  switch( m_pSource->getClass() )
+  {
+    case ClassJob::Warrior:
+    {
+      Warrior::onAction( *m_pSource->getAsPlayer(), *this );
+      break;
+    }
+  }
+}
+
 bool Action::Action::preCheck()
 {
   if( auto player = m_pSource->getAsPlayer() )
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index f6f18304f7..081be92efd 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -111,6 +111,8 @@ namespace Sapphire::World::Action
 
     void handleStatusEffects();
 
+    void handleJobAction();
+
     /*!
      * @brief Adds an actor filter to this action.
      * @param filter The ptr to the ActorFilter to add
diff --git a/src/world/Action/Job/Warrior.cpp b/src/world/Action/Job/Warrior.cpp
new file mode 100644
index 0000000000..0e8434ad25
--- /dev/null
+++ b/src/world/Action/Job/Warrior.cpp
@@ -0,0 +1,61 @@
+#include "Warrior.h"
+
+#include <Action/CommonAction.h>
+#include <Action/Action.h>
+#include <Actor/Player.h>
+
+using namespace Sapphire;
+using namespace Sapphire::World::Action;
+
+void Warrior::onAction( Entity::Player& player, Action& action )
+{
+  switch( action.getId() )
+  {
+    case Maim:
+    case StormsEye:
+    case StormsPath:
+    case SkullSunder:
+    case ButchersBlock:
+    {
+      if( action.isComboAction() && !action.isCorrectCombo() )
+        break;
+
+      if( player.hasStatusEffect( Defiance ) )
+        handleWrath( player, action );
+      break;
+    }
+  }
+}
+
+void Warrior::handleWrath( Entity::Player& player, Action& action )
+{
+  auto effectToApply = Wrath;
+  auto asChara = player.getAsChara();
+
+  if( player.hasStatusEffect( Wrath ) )
+  {
+    player.replaceSingleStatusEffectById( Wrath );
+    effectToApply = WrathII;
+  }
+  else if( player.hasStatusEffect( WrathII ) )
+  {
+    player.replaceSingleStatusEffectById( WrathII );
+    effectToApply = WrathIII;
+  }
+  else if( player.hasStatusEffect( WrathIII ) )
+  {
+    player.replaceSingleStatusEffectById( WrathIII );
+    effectToApply = WrathIV;
+  }
+  else if( player.hasStatusEffect( WrathIV ) )
+  {
+    player.replaceSingleStatusEffectById( WrathIV );
+    effectToApply = Infuriated;
+  }
+
+  if( !player.hasStatusEffect( Infuriated ) )
+  {
+    action.applyStatusEffectSelf( effectToApply );
+    player.addStatusEffectByIdIfNotExist( effectToApply, 30000, *asChara );
+  }
+}
\ No newline at end of file
diff --git a/src/world/Action/Job/Warrior.h b/src/world/Action/Job/Warrior.h
new file mode 100644
index 0000000000..4947433101
--- /dev/null
+++ b/src/world/Action/Job/Warrior.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <Common.h>
+#include "ForwardsZone.h"
+#include <cstdint>
+#include <unordered_map>
+#include <string>
+#include <vector>
+
+namespace Sapphire::World::Action
+{
+  class Warrior
+  {
+    public:
+      static void onAction( Entity::Player& player, Action& action );
+
+    private:
+      static void handleWrath( Entity::Player& player, Action& action );
+  };
+}
\ No newline at end of file
diff --git a/src/world/CMakeLists.txt b/src/world/CMakeLists.txt
index 632151e24b..9ba8c3aa24 100644
--- a/src/world/CMakeLists.txt
+++ b/src/world/CMakeLists.txt
@@ -7,6 +7,7 @@ file( GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
         *.cpp
         Actor/*.cpp
         Action/*.cpp
+        Action/Job/*.cpp
         ContentFinder/*.cpp
         DebugCommand/*.cpp
         Event/*.cpp

From b56aab72e594b4143e14cea805d04740bcc96efe Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Wed, 8 Mar 2023 18:09:10 +0100
Subject: [PATCH 19/45] Add some actions and statuses for war

---
 data/actions/player.json                      |  7 ++-
 src/scripts/action/war/ActionInnerBeast.cpp   | 45 +++++++++++++++++++
 src/scripts/action/war/ActionUnchained.cpp    | 31 +++++++++++++
 .../statuseffect/StatusEffectDefiance.cpp     | 22 +++++++++
 .../statuseffect/StatusEffectUnchained.cpp    | 23 ++++++++++
 5 files changed, 127 insertions(+), 1 deletion(-)
 create mode 100644 src/scripts/action/war/ActionInnerBeast.cpp
 create mode 100644 src/scripts/action/war/ActionUnchained.cpp
 create mode 100644 src/scripts/statuseffect/StatusEffectDefiance.cpp
 create mode 100644 src/scripts/statuseffect/StatusEffectUnchained.cpp

diff --git a/data/actions/player.json b/data/actions/player.json
index 15370c57ea..4764e4b895 100644
--- a/data/actions/player.json
+++ b/data/actions/player.json
@@ -758,7 +758,12 @@
     "restorePercentage": 0,
     "nextCombo": [],
     "statuses": {
-      "caster": [],
+      "caster": [
+        {
+          "id": 97,
+          "duration": 30000
+        }
+      ],
       "target": []
     }
   },
diff --git a/src/scripts/action/war/ActionInnerBeast.cpp b/src/scripts/action/war/ActionInnerBeast.cpp
new file mode 100644
index 0000000000..f53ba491ec
--- /dev/null
+++ b/src/scripts/action/war/ActionInnerBeast.cpp
@@ -0,0 +1,45 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+#include <Action/CommonAction.h>
+#include <Action/Action.h>
+
+using namespace Sapphire;
+using namespace Sapphire::World::Action;
+
+class ActionInnerBeast : public Sapphire::ScriptAPI::ActionScript
+{
+public:
+  ActionInnerBeast() : Sapphire::ScriptAPI::ActionScript( 49 )
+  {
+  }
+
+  static constexpr auto Potency = 300;
+
+  void onExecute( Sapphire::World::Action::Action& action ) override
+  {
+    auto pPlayer = action.getSourceChara()->getAsPlayer();
+    auto pSource = action.getSourceChara();
+    auto pTarget = action.getHitChara();
+
+    if( !pPlayer )
+      return;
+    
+    if( !pPlayer->hasStatusEffect( Unchained ) )
+      pPlayer->delModifier( Common::ParamModifier::DamageDealtPercent, -25 );
+
+    auto dmg = action.calcDamage( Potency );
+    action.getEffectbuilder()->damage( pSource, pTarget, dmg.first, dmg.second );
+    action.getEffectbuilder()->heal( pTarget, pSource, dmg.first, Common::ActionHitSeverityType::NormalHeal,
+                                     Common::ActionEffectResultFlag::EffectOnSource );
+
+    action.applyStatusEffectSelf( InnerBeast );
+    pPlayer->addStatusEffectByIdIfNotExist( InnerBeast, 15000, *pSource, 
+                                            { StatusModifier{ Common::ParamModifier::DamageTakenPercent, -20 } } );
+    
+    if( !pPlayer->hasStatusEffect( Unchained ) )
+      pPlayer->addModifier( Common::ParamModifier::DamageDealtPercent, -25 );
+  }
+};
+
+EXPOSE_SCRIPT( ActionInnerBeast );
\ No newline at end of file
diff --git a/src/scripts/action/war/ActionUnchained.cpp b/src/scripts/action/war/ActionUnchained.cpp
new file mode 100644
index 0000000000..482e92498d
--- /dev/null
+++ b/src/scripts/action/war/ActionUnchained.cpp
@@ -0,0 +1,31 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+#include <Action/CommonAction.h>
+#include <Action/Action.h>
+
+using namespace Sapphire;
+using namespace Sapphire::World::Action;
+
+class ActionUnchained : public Sapphire::ScriptAPI::ActionScript
+{
+public:
+  ActionUnchained() : Sapphire::ScriptAPI::ActionScript( 50 )
+  {
+  }
+
+  void onExecute( Sapphire::World::Action::Action& action ) override
+  {
+    auto pPlayer = action.getSourceChara()->getAsPlayer();
+
+    if( !pPlayer )
+      return;
+
+    pPlayer->delModifier( Common::ParamModifier::DamageDealtPercent, -25 );
+
+    action.applyStatusEffectSelf( Unchained );
+    pPlayer->addStatusEffectByIdIfNotExist( Unchained, 20000, *pPlayer->getAsChara() );
+  }
+};
+
+EXPOSE_SCRIPT( ActionUnchained );
\ No newline at end of file
diff --git a/src/scripts/statuseffect/StatusEffectDefiance.cpp b/src/scripts/statuseffect/StatusEffectDefiance.cpp
new file mode 100644
index 0000000000..25fe7c6d0a
--- /dev/null
+++ b/src/scripts/statuseffect/StatusEffectDefiance.cpp
@@ -0,0 +1,22 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+#include <Action/CommonAction.h>
+
+using namespace Sapphire;
+using namespace Sapphire::World::Action;
+
+class StatusEffectDefiance : public Sapphire::ScriptAPI::StatusEffectScript
+{
+public:
+  StatusEffectDefiance() : Sapphire::ScriptAPI::StatusEffectScript( 91 )
+  {
+  }
+
+  void onExpire( Entity::Chara& actor ) override
+  {
+    actor.removeSingleStatusEffectById( Unchained );
+  }
+};
+
+EXPOSE_SCRIPT( StatusEffectDefiance );
\ No newline at end of file
diff --git a/src/scripts/statuseffect/StatusEffectUnchained.cpp b/src/scripts/statuseffect/StatusEffectUnchained.cpp
new file mode 100644
index 0000000000..19aecdefdb
--- /dev/null
+++ b/src/scripts/statuseffect/StatusEffectUnchained.cpp
@@ -0,0 +1,23 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+#include <Action/CommonAction.h>
+
+using namespace Sapphire;
+using namespace Sapphire::World::Action;
+
+class StatusEffectUnchained : public Sapphire::ScriptAPI::StatusEffectScript
+{
+public:
+  StatusEffectUnchained() : Sapphire::ScriptAPI::StatusEffectScript( 92 )
+  {
+  }
+
+  void onExpire( Entity::Chara& actor ) override
+  {
+    if( actor.hasStatusEffect( Defiance ) )
+      actor.addModifier( Common::ParamModifier::DamageDealtPercent, -25 );
+  }
+};
+
+EXPOSE_SCRIPT( StatusEffectUnchained );
\ No newline at end of file

From 995bce495dd626de7caa2bb82c96cc328ddb9476 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Wed, 8 Mar 2023 18:10:15 +0100
Subject: [PATCH 20/45] Add even more modifiers

---
 data/actions/player.json           | 31 ++++++++++++++++++++++++++++--
 src/common/Common.h                |  9 ++++++++-
 src/world/Action/ActionLutData.cpp |  9 ++++++++-
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/data/actions/player.json b/data/actions/player.json
index 4764e4b895..51d6c81b0c 100644
--- a/data/actions/player.json
+++ b/data/actions/player.json
@@ -506,7 +506,7 @@
           "duration": 24000,
           "modifiers": [
             {
-              "modifier": "AttackPowerPercent",
+              "modifier": "DamageDealtPercent",
               "value": 20
             }
           ]
@@ -698,7 +698,34 @@
     "restorePercentage": 0,
     "nextCombo": [],
     "statuses": {
-      "caster": [],
+      "caster": [
+        {
+          "id": 91,
+          "duration": 0,
+          "modifiers": [
+            {
+              "modifier": "HPPercent",
+              "value": 25
+            },
+            {
+              "modifier": "DamageDealtPercent",
+              "value": -25
+            },
+            {
+              "modifier": "HealingRecoveryPercent",
+              "value": 20
+            },
+            {
+              "modifier": "AccuracyPercent",
+              "value": 5
+            },
+            {
+              "modifier": "EnmityPercent",
+              "value": 20
+            }
+          ]
+        }
+      ],
       "target": []
     }
   },
diff --git a/src/common/Common.h b/src/common/Common.h
index f1790f5b4b..09b8a0febe 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -910,7 +910,14 @@ namespace Sapphire::Common
     CriticalHitPowerPercent = 1020,
     CriticalHitResiliencePercent = 1021,
     CriticalHitPercent = 1022,
-    EnmityPercent = 1023
+    EnmityPercent = 1023,
+    DamageDealtPercent = 1024,
+    DamageTakenPercent = 1025,
+    HealingMagicRecoveryPercent = 1026,
+    SlashingResistancePercent = 1027,
+    PiercingResistancePercent = 1028,
+    BluntResistancePercent = 1029,
+    ProjectileResistancePercent = 1030
   };
 
   enum struct ActionAspect : uint8_t
diff --git a/src/world/Action/ActionLutData.cpp b/src/world/Action/ActionLutData.cpp
index 9e4c7bcdb5..4a86ebfb27 100644
--- a/src/world/Action/ActionLutData.cpp
+++ b/src/world/Action/ActionLutData.cpp
@@ -108,7 +108,14 @@ std::unordered_map< std::string, Common::ParamModifier > ActionLutData::m_modifi
   { "CriticalHitPowerPercent", Common::ParamModifier::CriticalHitPowerPercent },
   { "CriticalHitResiliencePercent", Common::ParamModifier::CriticalHitResiliencePercent },
   { "CriticalHitPercent", Common::ParamModifier::CriticalHitPercent },
-  { "EnmityPercent", Common::ParamModifier::EnmityPercent }
+  { "EnmityPercent", Common::ParamModifier::EnmityPercent },
+  { "DamageDealtPercent", Common::ParamModifier::DamageDealtPercent },
+  { "DamageTakenPercent", Common::ParamModifier::DamageTakenPercent },
+  { "HealingMagicRecoveryPercent", Common::ParamModifier::HealingMagicRecoveryPercent },
+  { "SlashingResistancePercent", Common::ParamModifier::SlashingResistancePercent },
+  { "PiercingResistancePercent", Common::ParamModifier::PiercingResistancePercent },
+  { "BluntResistancePercent", Common::ParamModifier::BluntResistancePercent },
+  { "ProjectileResistancePercent", Common::ParamModifier::ProjectileResistancePercent },
 };
 
 bool ActionLutData::cacheActions()

From 390a53a6c628d3bba6793542496dd7b3c6cc0c57 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Wed, 8 Mar 2023 18:10:51 +0100
Subject: [PATCH 21/45] Add statuseffect cost type

---
 src/common/Common.h         |  1 +
 src/world/Action/Action.cpp | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/common/Common.h b/src/common/Common.h
index 09b8a0febe..b8b8220c51 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -938,6 +938,7 @@ namespace Sapphire::Common
     MagicPoints = 3,
     TacticsPoints = 5,
     TacticsPoints1 = 6,
+    StatusEffect = 10,
     Sprint = 18,
 //    WARGauge = 22,
 //    DRKGauge = 25,
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index e2ff4b2737..02c8c8d4b6 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -783,6 +783,17 @@ bool Action::Action::primaryCostCheck( bool subtractCosts )
       return true;
     }
 
+    case Common::ActionPrimaryCostType::StatusEffect:
+    {
+      if( !m_pSource->hasStatusEffect( m_primaryCost ) )
+        return false;
+
+      if( subtractCosts )
+        m_pSource->removeSingleStatusEffectById( m_primaryCost );
+
+      return true;
+    }
+
     // free casts, likely just pure ogcds
     case Common::ActionPrimaryCostType::None:
     {

From b5c603ac63079033070aa92b8a822938452892f9 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Wed, 8 Mar 2023 18:12:12 +0100
Subject: [PATCH 22/45] Add option to not send statusremove order

---
 src/world/Actor/Chara.cpp | 19 ++++++++++++++++---
 src/world/Actor/Chara.h   |  7 +++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index a135f1e910..0cb1804ff3 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -562,7 +562,7 @@ void Sapphire::Entity::Chara::addStatusEffectByIdIfNotExist( uint32_t id, int32_
 }
 
 void Sapphire::Entity::Chara::addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Chara& source,
-                                                             std::vector< World::Action::StatusModifier >& modifiers, uint16_t param )
+                                                             std::vector< World::Action::StatusModifier > modifiers, uint16_t param )
 {
   if( hasStatusEffect( id ) )
     return;
@@ -590,6 +590,18 @@ void Sapphire::Entity::Chara::statusEffectFreeSlot( uint8_t slotId )
   m_statusEffectFreeSlotQueue.push( slotId );
 }
 
+void Sapphire::Entity::Chara::replaceSingleStatusEffectById( uint32_t id )
+{
+    for( const auto& effectIt : m_statusEffectMap )
+  {
+    if( effectIt.second->getId() == id )
+    {
+      removeStatusEffect( effectIt.first, false );
+      break;
+    }
+  }
+}
+
 void Sapphire::Entity::Chara::removeSingleStatusEffectById( uint32_t id )
 {
   for( const auto& effectIt : m_statusEffectMap )
@@ -602,7 +614,7 @@ void Sapphire::Entity::Chara::removeSingleStatusEffectById( uint32_t id )
   }
 }
 
-std::map< uint8_t, Sapphire::StatusEffect::StatusEffectPtr >::iterator Sapphire::Entity::Chara::removeStatusEffect( uint8_t effectSlotId )
+std::map< uint8_t, Sapphire::StatusEffect::StatusEffectPtr >::iterator Sapphire::Entity::Chara::removeStatusEffect( uint8_t effectSlotId, bool sendOrder )
 {
   auto pEffectIt = m_statusEffectMap.find( effectSlotId );
   if( pEffectIt == m_statusEffectMap.end() )
@@ -613,7 +625,8 @@ std::map< uint8_t, Sapphire::StatusEffect::StatusEffectPtr >::iterator Sapphire:
   auto pEffect = pEffectIt->second;
   pEffect->removeStatus();
 
-  server().queueForPlayers( getInRangePlayerIds( isPlayer() ), makeActorControl( getId(), StatusEffectLose, pEffect->getId() ) );
+  if( sendOrder )
+    server().queueForPlayers( getInRangePlayerIds( isPlayer() ), makeActorControl( getId(), StatusEffectLose, pEffect->getId() ) );
 
   auto it = m_statusEffectMap.erase( pEffectIt );
 
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index a5c4de9c9d..089313aee8 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -111,7 +111,9 @@ namespace Sapphire::Entity
     /// Status effect functions
     void addStatusEffect( StatusEffect::StatusEffectPtr pEffect );
 
-    std::map< uint8_t, StatusEffect::StatusEffectPtr >::iterator removeStatusEffect( uint8_t effectSlotId );
+    std::map< uint8_t, StatusEffect::StatusEffectPtr >::iterator removeStatusEffect( uint8_t effectSlotId, bool sendOrder = true );
+
+    void replaceSingleStatusEffectById( uint32_t id );
 
     void removeSingleStatusEffectById( uint32_t id );
 
@@ -140,7 +142,8 @@ namespace Sapphire::Entity
     void addStatusEffectById( uint32_t id, int32_t duration, Entity::Chara& source, uint16_t param = 0 );
     // add a status effect by id if it doesn't exist
     void addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Chara& source, uint16_t param = 0 );
-    void addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Chara& source, std::vector< World::Action::StatusModifier >& modifiers, uint16_t param = 0 );
+    void addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Chara& source, std::vector< World::Action::StatusModifier > modifiers,
+                                        uint16_t param = 0 );
 
     // remove a status effect by id
     void removeSingleStatusEffectFromId( uint32_t id );

From ec3c10989850763fbcfe83f8a92d5a1988cb0410 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Wed, 8 Mar 2023 18:12:49 +0100
Subject: [PATCH 23/45] Change delModifier assert to return early instead

---
 src/world/Actor/Chara.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 0cb1804ff3..05e9a62b97 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -842,7 +842,9 @@ void Sapphire::Entity::Chara::addModifier( Common::ParamModifier paramModifier,
 
 void Sapphire::Entity::Chara::delModifier( Common::ParamModifier paramModifier, int32_t value )
 {
-  assert( m_modifiers.count( paramModifier ) != 0 );
+  if( m_modifiers.find( paramModifier ) == m_modifiers.end() )
+    return;
+
   auto& mod = m_modifiers.at( paramModifier );
 
   mod.erase( std::remove( mod.begin(), mod.end(), value ), mod.end() );

From 9daf224019198f3445374a9edfacffeec1a36521 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Wed, 8 Mar 2023 18:13:29 +0100
Subject: [PATCH 24/45] Add option for scripts to enable the generic/lut
 handler

---
 src/world/Action/Action.cpp | 13 +++++++++++--
 src/world/Action/Action.h   |  3 +++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 02c8c8d4b6..190965eb2e 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -517,8 +517,9 @@ void Action::Action::handleAction()
 
   auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
   auto hasLutEntry = hasValidLutEntry();
+  auto hasScript = scriptMgr.onExecute( *this );
 
-  if( !scriptMgr.onExecute( *this ) && !hasLutEntry )
+  if( !hasScript && !hasLutEntry )
   {
     if( auto player = m_pSource->getAsPlayer() )
     {
@@ -528,9 +529,12 @@ void Action::Action::handleAction()
     return;
   }
 
+  if( !hasScript )
+    m_enableGenericHandler = true;
+
   Network::Util::Player::sendHudParam( *m_pSource->getAsPlayer() );
 
-  if( !hasLutEntry || m_hitActors.empty() )
+  if( !m_enableGenericHandler || !hasLutEntry || m_hitActors.empty() )
   {
     // send any effect packet added by script or an empty one just to play animation for other players
     m_effectBuilder->buildAndSendPackets( m_hitActors );
@@ -962,3 +966,8 @@ uint64_t Action::Action::getCastTimeRest() const
 {
   return m_castTimeRestMs;
 }
+
+void Action::Action::enableGenericHandler()
+{
+  m_enableGenericHandler = true;
+}
\ No newline at end of file
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index 081be92efd..66a680f92d 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -53,6 +53,8 @@ namespace Sapphire::World::Action
 
     uint64_t getCastTimeRest() const;
 
+    void enableGenericHandler();
+
     /*!
      * @brief Checks if a chara has enough resources available to cast the action (tp/mp/etc)
      * @return true if they have the required resources
@@ -207,6 +209,7 @@ namespace Sapphire::World::Action
     bool m_canTargetFriendly{};
     bool m_canTargetHostile{};
     bool m_canTargetDead{};
+    bool m_enableGenericHandler{};
 
     Common::ActionInterruptType m_interruptType;
 

From ade5cfa38f321fdd459a91832e2b0d0e55fdcca8 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Wed, 8 Mar 2023 18:16:49 +0100
Subject: [PATCH 25/45] Add enums for common action values

---
 src/world/Action/CommonAction.h | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 src/world/Action/CommonAction.h

diff --git a/src/world/Action/CommonAction.h b/src/world/Action/CommonAction.h
new file mode 100644
index 0000000000..e67132b79d
--- /dev/null
+++ b/src/world/Action/CommonAction.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <cstdint>
+#include <vector>
+#include <string>
+
+namespace Sapphire::World::Action
+{
+  enum ActionSkill
+  {
+    SkullSunder = 35,
+    Maim = 37,
+    StormsPath = 42,
+    StormsEye = 45,
+    ButchersBlock = 47
+  };
+
+  enum ActionStatus
+  {
+    Defiance = 91,
+    Unchained = 92,
+    Wrath = 93,
+    WrathII = 94,
+    WrathIII = 95,
+    WrathIV = 96,
+    Infuriated = 97,
+    InnerBeast = 411,
+    Deliverance = 729
+  };
+}
\ No newline at end of file

From b4cd677264150b57c432d2ed1ed7a1bf52b80939 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Wed, 8 Mar 2023 19:12:35 +0100
Subject: [PATCH 26/45] fix indentation

---
 src/world/Actor/Chara.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 05e9a62b97..913f0df231 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -592,7 +592,7 @@ void Sapphire::Entity::Chara::statusEffectFreeSlot( uint8_t slotId )
 
 void Sapphire::Entity::Chara::replaceSingleStatusEffectById( uint32_t id )
 {
-    for( const auto& effectIt : m_statusEffectMap )
+  for( const auto& effectIt : m_statusEffectMap )
   {
     if( effectIt.second->getId() == id )
     {

From 8d082348545ccee6fd5e6089f25bedc7fa385fff Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Wed, 8 Mar 2023 19:17:00 +0100
Subject: [PATCH 27/45] Fix modifier name for Defiance

---
 data/actions/player.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/actions/player.json b/data/actions/player.json
index 51d6c81b0c..8771bae7fe 100644
--- a/data/actions/player.json
+++ b/data/actions/player.json
@@ -712,7 +712,7 @@
               "value": -25
             },
             {
-              "modifier": "HealingRecoveryPercent",
+              "modifier": "HealingMagicRecoveryPercent",
               "value": 20
             },
             {

From df4977cca5f20c257a361d519b4a7da6df0db463 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Wed, 8 Mar 2023 19:18:12 +0100
Subject: [PATCH 28/45] Remove status tick logging

---
 src/world/Script/ScriptMgr.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp
index d56a06261f..e6d9c1c13b 100644
--- a/src/world/Script/ScriptMgr.cpp
+++ b/src/world/Script/ScriptMgr.cpp
@@ -644,9 +644,6 @@ bool Sapphire::Scripting::ScriptMgr::onStatusTick( Entity::CharaPtr pChara, Sapp
   auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::StatusEffectScript >( effect.getId() );
   if( script )
   {
-    if( pChara->isPlayer() )
-      PlayerMgr::sendDebug( *pChara->getAsPlayer(), "Calling status tick for statusid#{0}", effect.getId() );
-
     script->onTick( *pChara );
     return true;
   }

From 38a0cd12cae12a92d7cbb8b3173cbe4b2eefd647 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Thu, 9 Mar 2023 00:14:48 +0100
Subject: [PATCH 29/45] Move modifiers to statuseffect

---
 src/scripts/action/war/ActionInnerBeast.cpp   | 10 +++-
 src/scripts/action/war/ActionUnchained.cpp    |  4 +-
 .../statuseffect/StatusEffectUnchained.cpp    |  5 +-
 src/world/Actor/Chara.cpp                     | 59 ++++++++-----------
 src/world/Actor/Chara.h                       |  9 +--
 src/world/StatusEffect/StatusEffect.cpp       | 52 ++++++++++++----
 src/world/StatusEffect/StatusEffect.h         | 10 +++-
 7 files changed, 88 insertions(+), 61 deletions(-)

diff --git a/src/scripts/action/war/ActionInnerBeast.cpp b/src/scripts/action/war/ActionInnerBeast.cpp
index f53ba491ec..afd5e72695 100644
--- a/src/scripts/action/war/ActionInnerBeast.cpp
+++ b/src/scripts/action/war/ActionInnerBeast.cpp
@@ -3,6 +3,7 @@
 #include <Actor/Player.h>
 #include <Action/CommonAction.h>
 #include <Action/Action.h>
+#include <StatusEffect/StatusEffect.h>
 
 using namespace Sapphire;
 using namespace Sapphire::World::Action;
@@ -25,8 +26,8 @@ class ActionInnerBeast : public Sapphire::ScriptAPI::ActionScript
     if( !pPlayer )
       return;
     
-    if( !pPlayer->hasStatusEffect( Unchained ) )
-      pPlayer->delModifier( Common::ParamModifier::DamageDealtPercent, -25 );
+    if( auto status = pPlayer->getStatusEffectById( Defiance ); status )
+      status->setModifier( Common::ParamModifier::DamageDealtPercent, 0 );
 
     auto dmg = action.calcDamage( Potency );
     action.getEffectbuilder()->damage( pSource, pTarget, dmg.first, dmg.second );
@@ -38,7 +39,10 @@ class ActionInnerBeast : public Sapphire::ScriptAPI::ActionScript
                                             { StatusModifier{ Common::ParamModifier::DamageTakenPercent, -20 } } );
     
     if( !pPlayer->hasStatusEffect( Unchained ) )
-      pPlayer->addModifier( Common::ParamModifier::DamageDealtPercent, -25 );
+    {
+      if( auto status = pPlayer->getStatusEffectById( Defiance ); status )
+        status->setModifier( Common::ParamModifier::DamageDealtPercent, -25 );
+    }
   }
 };
 
diff --git a/src/scripts/action/war/ActionUnchained.cpp b/src/scripts/action/war/ActionUnchained.cpp
index 482e92498d..3025ce20d4 100644
--- a/src/scripts/action/war/ActionUnchained.cpp
+++ b/src/scripts/action/war/ActionUnchained.cpp
@@ -3,6 +3,7 @@
 #include <Actor/Player.h>
 #include <Action/CommonAction.h>
 #include <Action/Action.h>
+#include <StatusEffect/StatusEffect.h>
 
 using namespace Sapphire;
 using namespace Sapphire::World::Action;
@@ -21,7 +22,8 @@ class ActionUnchained : public Sapphire::ScriptAPI::ActionScript
     if( !pPlayer )
       return;
 
-    pPlayer->delModifier( Common::ParamModifier::DamageDealtPercent, -25 );
+    if( auto status = pPlayer->getStatusEffectById( Defiance ); status )
+      status->setModifier( Common::ParamModifier::DamageDealtPercent, 0 );
 
     action.applyStatusEffectSelf( Unchained );
     pPlayer->addStatusEffectByIdIfNotExist( Unchained, 20000, *pPlayer->getAsChara() );
diff --git a/src/scripts/statuseffect/StatusEffectUnchained.cpp b/src/scripts/statuseffect/StatusEffectUnchained.cpp
index 19aecdefdb..3a5f991e6c 100644
--- a/src/scripts/statuseffect/StatusEffectUnchained.cpp
+++ b/src/scripts/statuseffect/StatusEffectUnchained.cpp
@@ -2,6 +2,7 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 #include <Action/CommonAction.h>
+#include <StatusEffect/StatusEffect.h>
 
 using namespace Sapphire;
 using namespace Sapphire::World::Action;
@@ -15,8 +16,8 @@ class StatusEffectUnchained : public Sapphire::ScriptAPI::StatusEffectScript
 
   void onExpire( Entity::Chara& actor ) override
   {
-    if( actor.hasStatusEffect( Defiance ) )
-      actor.addModifier( Common::ParamModifier::DamageDealtPercent, -25 );
+    if( auto status = actor.getStatusEffectById( Defiance ); status )
+      status->setModifier( Common::ParamModifier::DamageDealtPercent, -25 );
   }
 };
 
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 913f0df231..16d611b2bb 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -643,6 +643,17 @@ std::map< uint8_t, Sapphire::StatusEffect::StatusEffectPtr > Sapphire::Entity::C
   return m_statusEffectMap;
 }
 
+Sapphire::StatusEffect::StatusEffectPtr Sapphire::Entity::Chara::getStatusEffectById( uint32_t id ) const
+{
+  for( const auto& effectIt : m_statusEffectMap )
+  {
+    if( effectIt.second->getId() == id )
+      return effectIt.second;
+  }
+
+  return nullptr;
+}
+
 const uint8_t* Sapphire::Entity::Chara::getLookArray() const
 {
   return m_customize;
@@ -815,45 +826,23 @@ void Sapphire::Entity::Chara::setStatValue( Common::BaseParam baseParam, uint32_
 
 float Sapphire::Entity::Chara::getModifier( Common::ParamModifier paramModifier ) const
 {
-  if( m_modifiers.find( paramModifier ) == m_modifiers.end() )
-    return paramModifier >= Common::ParamModifier::StrengthPercent ? 1.0f : 0;
+  auto result = paramModifier >= Common::ParamModifier::StrengthPercent ? 1.0f : 0;
 
-  auto& mod = m_modifiers.at( paramModifier );
-  if( paramModifier >= Common::ParamModifier::StrengthPercent )
-  {
-    auto valPercent = 1.0f;
-    for( const auto val : mod )
-      valPercent *= 1.0f + ( val / 100.0f );
-    return valPercent;
-  }
-  else
+  for( const auto& [ key, status ] : m_statusEffectMap )
   {
-    return std::accumulate( mod.begin(), mod.end(), 0 );
-  }
-}
-
-void Sapphire::Entity::Chara::addModifier( Common::ParamModifier paramModifier, int32_t value )
-{
-  m_modifiers[ paramModifier ].push_back( value );
-
-  if( auto pPlayer = this->getAsPlayer(); pPlayer )
-    Common::Service< World::Manager::PlayerMgr >::ref().sendDebug( *pPlayer, "Modifier: {}, value: {}", static_cast< int32_t >( paramModifier ), getModifier( paramModifier ) );
-}
-
-void Sapphire::Entity::Chara::delModifier( Common::ParamModifier paramModifier, int32_t value )
-{
-  if( m_modifiers.find( paramModifier ) == m_modifiers.end() )
-    return;
-
-  auto& mod = m_modifiers.at( paramModifier );
-
-  mod.erase( std::remove( mod.begin(), mod.end(), value ), mod.end() );
+    for( const auto& [ mod, val ] : status->getModifiers() )
+    {
+      if( mod != paramModifier )
+        continue;
 
-  if( mod.size() == 0 )
-    m_modifiers.erase( paramModifier );
+      if( paramModifier >= Common::ParamModifier::StrengthPercent )
+        result *= 1.0f + ( val / 100.0f );
+      else
+        result += val;
+    }
+  }
 
-  if( auto pPlayer = this->getAsPlayer(); pPlayer )
-    Common::Service< World::Manager::PlayerMgr >::ref().sendDebug( *pPlayer, "Modifier: {}, value: {}", static_cast< int32_t >( paramModifier ), getModifier( paramModifier ) );
+  return result;
 }
 
 void Sapphire::Entity::Chara::onTick()
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index 089313aee8..df81d62669 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -28,13 +28,10 @@ namespace Sapphire::Entity
   public:
 
     using ActorStatsArray = std::array< uint32_t, STAT_ARRAY_SIZE >;
-    using ActorModifiersMap = std::unordered_map< Common::ParamModifier, std::vector< int32_t > >;
 
     ActorStatsArray m_baseStats{ 0 };
     ActorStatsArray m_bonusStats{ 0 };
 
-    ActorModifiersMap m_modifiers{ 0 };
-
   protected:
     char m_name[34];
     /*! Last tick time for the actor  ( in ms ) */
@@ -131,6 +128,8 @@ namespace Sapphire::Entity
 
     std::map< uint8_t, Sapphire::StatusEffect::StatusEffectPtr > getStatusEffectMap() const;
 
+    Sapphire::StatusEffect::StatusEffectPtr getStatusEffectById( uint32_t id ) const;
+
     void sendStatusEffectUpdate();
 
     /*! return a const pointer to the look array */
@@ -169,10 +168,6 @@ namespace Sapphire::Entity
 
     float getModifier( Common::ParamModifier paramModifier ) const;
 
-    void addModifier( Common::ParamModifier paramModifier, int32_t value );
-
-    void delModifier( Common::ParamModifier paramModifier, int32_t value );
-
     uint32_t getHp() const;
 
     uint32_t getHpPercent() const;
diff --git a/src/world/StatusEffect/StatusEffect.cpp b/src/world/StatusEffect/StatusEffect.cpp
index b31a082949..f0598fb42d 100644
--- a/src/world/StatusEffect/StatusEffect.cpp
+++ b/src/world/StatusEffect/StatusEffect.cpp
@@ -6,13 +6,17 @@
 #include <algorithm>
 #include <Service.h>
 
+#include "Manager/PlayerMgr.h"
+
 #include "Actor/Chara.h"
+#include "Actor/Player.h"
 #include "Actor/GameObject.h"
 
 #include "Script/ScriptMgr.h"
 
 #include "StatusEffect.h"
 
+using namespace Sapphire;
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
 //using namespace Sapphire::Network::Packets::WorldPackets::Server;
@@ -21,7 +25,7 @@ Sapphire::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPt
                                                     uint32_t duration, std::vector< World::Action::StatusModifier >& modifiers, uint32_t tickRate ) :
   StatusEffect( id, sourceActor, targetActor, duration, tickRate )
 {
-  m_modifiers = std::move( modifiers );
+  setModifiers( modifiers );
 }
 
 Sapphire::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor,
@@ -88,21 +92,49 @@ uint16_t Sapphire::StatusEffect::StatusEffect::getParam() const
   return m_param;
 }
 
-void Sapphire::StatusEffect::StatusEffect::applyStatus()
+std::unordered_map< Common::ParamModifier, int32_t >& Sapphire::StatusEffect::StatusEffect::getModifiers()
 {
-  m_startTime = Util::getTimeMs();
-  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  return m_modifiers;
+}
 
-  for( const auto& mod : m_modifiers )
+void Sapphire::StatusEffect::StatusEffect::setModifiers( std::vector< World::Action::StatusModifier > modifiers )
+{
+  for( const auto& mod : modifiers )
   {
-    // TODO: ticks
     if( mod.modifier != Common::ParamModifier::TickDamage && mod.modifier != Common::ParamModifier::TickHeal )
-      m_targetActor->addModifier( mod.modifier, mod.value );
+      setModifier( mod.modifier, mod.value );
     else if( mod.modifier == Common::ParamModifier::TickDamage )
       registerTickEffect( mod.modifier, mod.value );
     else if( mod.modifier == Common::ParamModifier::TickHeal )
       registerTickEffect( mod.modifier, mod.value );
   }
+}
+
+void Sapphire::StatusEffect::StatusEffect::setModifier( Common::ParamModifier paramModifier, int32_t value )
+{
+  m_modifiers[ paramModifier ] = value;
+
+  if( auto pPlayer = m_targetActor->getAsPlayer(); pPlayer )
+    Common::Service< World::Manager::PlayerMgr >::ref().sendDebug( *pPlayer, "Modifier: {}, value: {}", static_cast< int32_t >( paramModifier ),
+                                                                   pPlayer->getModifier( paramModifier ) );
+}
+
+void Sapphire::StatusEffect::StatusEffect::delModifier( Common::ParamModifier paramModifier )
+{
+  if( m_modifiers.find( paramModifier ) == m_modifiers.end() )
+    return;
+
+  m_modifiers.erase( paramModifier );
+
+  if( auto pPlayer = m_targetActor->getAsPlayer(); pPlayer )
+    Common::Service< World::Manager::PlayerMgr >::ref().sendDebug( *pPlayer, "Modifier: {}, value: {}", static_cast< int32_t >( paramModifier ),
+                                                                   pPlayer->getModifier( paramModifier ) );
+}
+
+void Sapphire::StatusEffect::StatusEffect::applyStatus()
+{
+  m_startTime = Util::getTimeMs();
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
 
   m_targetActor->calculateStats();
 
@@ -131,11 +163,7 @@ void Sapphire::StatusEffect::StatusEffect::removeStatus()
 {
   auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
 
-  for( const auto& mod : m_modifiers )
-  {
-    if( mod.modifier != Common::ParamModifier::TickDamage && mod.modifier != Common::ParamModifier::TickHeal )
-      m_targetActor->delModifier( mod.modifier, mod.value );
-  }
+  m_modifiers.clear();
 
   m_targetActor->calculateStats();
 
diff --git a/src/world/StatusEffect/StatusEffect.h b/src/world/StatusEffect/StatusEffect.h
index f18ecbcfe5..80680efd9d 100644
--- a/src/world/StatusEffect/StatusEffect.h
+++ b/src/world/StatusEffect/StatusEffect.h
@@ -21,6 +21,14 @@ class StatusEffect
 
   void onTick();
 
+  std::unordered_map< Common::ParamModifier, int32_t >& getModifiers();
+
+  void setModifiers( std::vector< World::Action::StatusModifier > modifiers );
+
+  void setModifier( Common::ParamModifier paramModifier, int32_t value );
+
+  void delModifier( Common::ParamModifier paramModifier );
+
   void applyStatus();
 
   void removeStatus();
@@ -62,7 +70,7 @@ class StatusEffect
   uint16_t m_param;
   std::string m_name;
   std::pair< Common::ParamModifier, uint32_t > m_currTickEffect;
-  std::vector< World::Action::StatusModifier > m_modifiers;
+  std::unordered_map< Common::ParamModifier, int32_t > m_modifiers;
 };
 
 }

From f12e7ec65170920e505af47eb2f5e40dc5a0defb Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Thu, 9 Mar 2023 00:15:55 +0100
Subject: [PATCH 30/45] Add ParryPercent modifier

---
 src/common/Common.h                | 3 ++-
 src/world/Action/ActionLutData.cpp | 1 +
 src/world/Action/Job/Warrior.cpp   | 7 ++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index b8b8220c51..9f327162f4 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -917,7 +917,8 @@ namespace Sapphire::Common
     SlashingResistancePercent = 1027,
     PiercingResistancePercent = 1028,
     BluntResistancePercent = 1029,
-    ProjectileResistancePercent = 1030
+    ProjectileResistancePercent = 1030,
+    ParryPercent = 1031
   };
 
   enum struct ActionAspect : uint8_t
diff --git a/src/world/Action/ActionLutData.cpp b/src/world/Action/ActionLutData.cpp
index 4a86ebfb27..d8a74a4d13 100644
--- a/src/world/Action/ActionLutData.cpp
+++ b/src/world/Action/ActionLutData.cpp
@@ -116,6 +116,7 @@ std::unordered_map< std::string, Common::ParamModifier > ActionLutData::m_modifi
   { "PiercingResistancePercent", Common::ParamModifier::PiercingResistancePercent },
   { "BluntResistancePercent", Common::ParamModifier::BluntResistancePercent },
   { "ProjectileResistancePercent", Common::ParamModifier::ProjectileResistancePercent },
+  { "ParryPercent", Common::ParamModifier::ParryPercent }
 };
 
 bool ActionLutData::cacheActions()
diff --git a/src/world/Action/Job/Warrior.cpp b/src/world/Action/Job/Warrior.cpp
index 0e8434ad25..7f4cbb1a69 100644
--- a/src/world/Action/Job/Warrior.cpp
+++ b/src/world/Action/Job/Warrior.cpp
@@ -30,32 +30,37 @@ void Warrior::onAction( Entity::Player& player, Action& action )
 void Warrior::handleWrath( Entity::Player& player, Action& action )
 {
   auto effectToApply = Wrath;
+  auto parry = 2;
   auto asChara = player.getAsChara();
 
   if( player.hasStatusEffect( Wrath ) )
   {
     player.replaceSingleStatusEffectById( Wrath );
     effectToApply = WrathII;
+    parry += 2;
   }
   else if( player.hasStatusEffect( WrathII ) )
   {
     player.replaceSingleStatusEffectById( WrathII );
     effectToApply = WrathIII;
+    parry += 2;
   }
   else if( player.hasStatusEffect( WrathIII ) )
   {
     player.replaceSingleStatusEffectById( WrathIII );
     effectToApply = WrathIV;
+    parry += 2;
   }
   else if( player.hasStatusEffect( WrathIV ) )
   {
     player.replaceSingleStatusEffectById( WrathIV );
     effectToApply = Infuriated;
+    parry += 2;
   }
 
   if( !player.hasStatusEffect( Infuriated ) )
   {
     action.applyStatusEffectSelf( effectToApply );
-    player.addStatusEffectByIdIfNotExist( effectToApply, 30000, *asChara );
+    player.addStatusEffectByIdIfNotExist( effectToApply, 30000, *asChara, { StatusModifier{ Common::ParamModifier::ParryPercent, parry } } );
   }
 }
\ No newline at end of file

From df9c51f27b598353c391f5d618323f72b997e727 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Thu, 9 Mar 2023 00:16:12 +0100
Subject: [PATCH 31/45] Remove wrath when Defiance ends

---
 src/scripts/statuseffect/StatusEffectDefiance.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/scripts/statuseffect/StatusEffectDefiance.cpp b/src/scripts/statuseffect/StatusEffectDefiance.cpp
index 25fe7c6d0a..9f26421af7 100644
--- a/src/scripts/statuseffect/StatusEffectDefiance.cpp
+++ b/src/scripts/statuseffect/StatusEffectDefiance.cpp
@@ -16,6 +16,11 @@ class StatusEffectDefiance : public Sapphire::ScriptAPI::StatusEffectScript
   void onExpire( Entity::Chara& actor ) override
   {
     actor.removeSingleStatusEffectById( Unchained );
+    actor.removeSingleStatusEffectById( Wrath );
+    actor.removeSingleStatusEffectById( WrathII );
+    actor.removeSingleStatusEffectById( WrathIII );
+    actor.removeSingleStatusEffectById( WrathIV );
+    actor.removeSingleStatusEffectById( Infuriated );
   }
 };
 

From ff0a1c8be0dd0c408d949bd05c2f8baeb126f950 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Thu, 9 Mar 2023 00:25:18 +0100
Subject: [PATCH 32/45] Apply modifiers in applyStatus

---
 src/world/Actor/Chara.cpp               |  2 +-
 src/world/StatusEffect/StatusEffect.cpp | 25 +++++++++++--------------
 src/world/StatusEffect/StatusEffect.h   |  1 +
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 16d611b2bb..49f83f3d4f 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -507,8 +507,8 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf
   if( nextSlot == -1 )
     return;
 
-  pEffect->applyStatus();
   m_statusEffectMap[ nextSlot ] = pEffect;
+  pEffect->applyStatus();
 
   auto statusEffectAdd = makeZonePacket< FFXIVIpcActionIntegrity >( getId() );
 
diff --git a/src/world/StatusEffect/StatusEffect.cpp b/src/world/StatusEffect/StatusEffect.cpp
index f0598fb42d..56d47746f6 100644
--- a/src/world/StatusEffect/StatusEffect.cpp
+++ b/src/world/StatusEffect/StatusEffect.cpp
@@ -25,7 +25,7 @@ Sapphire::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPt
                                                     uint32_t duration, std::vector< World::Action::StatusModifier >& modifiers, uint32_t tickRate ) :
   StatusEffect( id, sourceActor, targetActor, duration, tickRate )
 {
-  setModifiers( modifiers );
+  m_statusModifiers = std::move( modifiers );
 }
 
 Sapphire::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor,
@@ -97,19 +97,6 @@ std::unordered_map< Common::ParamModifier, int32_t >& Sapphire::StatusEffect::St
   return m_modifiers;
 }
 
-void Sapphire::StatusEffect::StatusEffect::setModifiers( std::vector< World::Action::StatusModifier > modifiers )
-{
-  for( const auto& mod : modifiers )
-  {
-    if( mod.modifier != Common::ParamModifier::TickDamage && mod.modifier != Common::ParamModifier::TickHeal )
-      setModifier( mod.modifier, mod.value );
-    else if( mod.modifier == Common::ParamModifier::TickDamage )
-      registerTickEffect( mod.modifier, mod.value );
-    else if( mod.modifier == Common::ParamModifier::TickHeal )
-      registerTickEffect( mod.modifier, mod.value );
-  }
-}
-
 void Sapphire::StatusEffect::StatusEffect::setModifier( Common::ParamModifier paramModifier, int32_t value )
 {
   m_modifiers[ paramModifier ] = value;
@@ -136,6 +123,16 @@ void Sapphire::StatusEffect::StatusEffect::applyStatus()
   m_startTime = Util::getTimeMs();
   auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
 
+  for( const auto& mod : m_statusModifiers )
+  {
+    if( mod.modifier != Common::ParamModifier::TickDamage && mod.modifier != Common::ParamModifier::TickHeal )
+      setModifier( mod.modifier, mod.value );
+    else if( mod.modifier == Common::ParamModifier::TickDamage )
+      registerTickEffect( mod.modifier, mod.value );
+    else if( mod.modifier == Common::ParamModifier::TickHeal )
+      registerTickEffect( mod.modifier, mod.value );
+  }
+
   m_targetActor->calculateStats();
 
   // this is only right when an action is being used by the player
diff --git a/src/world/StatusEffect/StatusEffect.h b/src/world/StatusEffect/StatusEffect.h
index 80680efd9d..4a4015dc6a 100644
--- a/src/world/StatusEffect/StatusEffect.h
+++ b/src/world/StatusEffect/StatusEffect.h
@@ -70,6 +70,7 @@ class StatusEffect
   uint16_t m_param;
   std::string m_name;
   std::pair< Common::ParamModifier, uint32_t > m_currTickEffect;
+  std::vector< World::Action::StatusModifier > m_statusModifiers;
   std::unordered_map< Common::ParamModifier, int32_t > m_modifiers;
 };
 

From cf32d4fe4d37e6b21de2514c4b2e59a6e7f11117 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Thu, 9 Mar 2023 17:31:10 +0100
Subject: [PATCH 33/45] Remove unused method

---
 src/world/StatusEffect/StatusEffect.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/world/StatusEffect/StatusEffect.h b/src/world/StatusEffect/StatusEffect.h
index 4a4015dc6a..9b750121e5 100644
--- a/src/world/StatusEffect/StatusEffect.h
+++ b/src/world/StatusEffect/StatusEffect.h
@@ -23,8 +23,6 @@ class StatusEffect
 
   std::unordered_map< Common::ParamModifier, int32_t >& getModifiers();
 
-  void setModifiers( std::vector< World::Action::StatusModifier > modifiers );
-
   void setModifier( Common::ParamModifier paramModifier, int32_t value );
 
   void delModifier( Common::ParamModifier paramModifier );

From f4a3c9493b45ec2970fe3f87cdfbfbe3f47302fb Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Thu, 9 Mar 2023 17:17:27 +0100
Subject: [PATCH 34/45] Persistence for cross-class skills

---
 .../20230309164293_AddBorrowAction.sql        |  1 +
 src/api/PlayerMinimal.cpp                     |  4 +++-
 src/common/Common.h                           |  1 +
 src/common/Database/ZoneDbConnection.cpp      |  6 +++---
 src/world/Actor/Player.cpp                    | 16 +++++++++++++++
 src/world/Actor/Player.h                      |  7 +++++++
 src/world/Actor/PlayerSql.cpp                 | 20 +++++++++++++++----
 .../Network/Handlers/PacketCommandHandler.cpp |  5 +++++
 src/world/Network/Util/PlayerUtil.cpp         |  2 ++
 9 files changed, 54 insertions(+), 8 deletions(-)
 create mode 100644 sql/migrations/20230309164293_AddBorrowAction.sql

diff --git a/sql/migrations/20230309164293_AddBorrowAction.sql b/sql/migrations/20230309164293_AddBorrowAction.sql
new file mode 100644
index 0000000000..1cdc3f22ad
--- /dev/null
+++ b/sql/migrations/20230309164293_AddBorrowAction.sql
@@ -0,0 +1 @@
+ALTER TABLE `characlass` ADD `BorrowAction` binary(40) DEFAULT NULL NULL AFTER `Lvl`;
\ No newline at end of file
diff --git a/src/api/PlayerMinimal.cpp b/src/api/PlayerMinimal.cpp
index c761ac0439..f383a96d12 100644
--- a/src/api/PlayerMinimal.cpp
+++ b/src/api/PlayerMinimal.cpp
@@ -256,12 +256,14 @@ void PlayerMinimal::saveAsNew()
       break;
   }
 
-  // CharacterId, ClassIdx, Exp, Lvl
+  // CharacterId, ClassIdx, Exp, Lvl, BorrowAction
   auto stmtClass = g_charaDb.getPreparedStatement( Db::ZoneDbStatements::CHARA_CLASS_INS );
   stmtClass->setUInt64( 1, m_characterId );
   stmtClass->setInt( 2, g_exdData.getRow< Excel::ClassJob >( m_class )->data().WorkIndex );
   stmtClass->setInt( 3, 0 );
   stmtClass->setInt( 4, 1 );
+  std::vector< uint8_t > borrowActionVec( Common::ARRSIZE_BORROWACTION * 4 );
+  stmtClass->setBinary( 5, borrowActionVec );
   g_charaDb.directExecute( stmtClass );
 
   auto stmtSearchInfo = g_charaDb.getPreparedStatement( Db::ZoneDbStatements::CHARA_SEARCHINFO_INS );
diff --git a/src/common/Common.h b/src/common/Common.h
index 9f327162f4..2fbb197cae 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -37,6 +37,7 @@ namespace Sapphire::Common
   const uint16_t ARRSIZE_UNLOCKS = 64u;
   const uint16_t ARRSIZE_ORCHESTRION = 40u;
   const uint16_t ARRSIZE_MONSTERNOTE = 12u;
+  const uint16_t ARRSIZE_BORROWACTION = 10u;
 
   const uint8_t TOWN_COUNT = 6;
 
diff --git a/src/common/Database/ZoneDbConnection.cpp b/src/common/Database/ZoneDbConnection.cpp
index 10f9f854e0..6a0f79a0a3 100644
--- a/src/common/Database/ZoneDbConnection.cpp
+++ b/src/common/Database/ZoneDbConnection.cpp
@@ -161,11 +161,11 @@ void Sapphire::Db::ZoneDbConnection::doPrepareStatements()
   prepareStatement( CHARA_SEL_QUEST, "SELECT * FROM charaquest WHERE CharacterId = ?;", CONNECTION_SYNC );
 
   /// CLASS INFO
-  prepareStatement( CHARA_CLASS_SEL, "SELECT ClassIdx, Exp, Lvl FROM characlass WHERE CharacterId = ?;",
+  prepareStatement( CHARA_CLASS_SEL, "SELECT ClassIdx, Exp, Lvl, BorrowAction FROM characlass WHERE CharacterId = ?;",
                     CONNECTION_SYNC );
-  prepareStatement( CHARA_CLASS_INS, "INSERT INTO characlass ( CharacterId, ClassIdx, Exp, Lvl ) VALUES( ?,?,?,? );",
+  prepareStatement( CHARA_CLASS_INS, "INSERT INTO characlass ( CharacterId, ClassIdx, Exp, Lvl, BorrowAction ) VALUES( ?,?,?,?,? );",
                     CONNECTION_BOTH );
-  prepareStatement( CHARA_CLASS_UP, "UPDATE characlass SET Exp = ?, Lvl = ? WHERE CharacterId = ? AND ClassIdx = ?;",
+  prepareStatement( CHARA_CLASS_UP, "UPDATE characlass SET Exp = ?, Lvl = ?, BorrowAction = ? WHERE CharacterId = ? AND ClassIdx = ?;",
                     CONNECTION_ASYNC );
   prepareStatement( CHARA_CLASS_DEL, "DELETE FROM characlass WHERE CharacterId = ?;", CONNECTION_ASYNC );
 
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 2ce6e2c300..2ad26bf276 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -563,6 +563,22 @@ void Player::setRewardFlag( Common::UnlockEntry unlockId )
   Network::Util::Player::sendActorControlSelf( *this, SetRewardFlag, unlock, 1 );
 }
 
+void Player::setBorrowAction( uint8_t slot, uint32_t action )
+{
+  if( slot > Common::ARRSIZE_BORROWACTION )
+    return;
+
+  auto& borrowAction = getBorrowAction();
+  borrowAction[ slot ] = action;
+}
+
+Player::BorrowAction& Player::getBorrowAction()
+{
+  auto& exdData = Common::Service< Data::ExdData >::ref();
+  uint8_t classJobIndex = exdData.getRow< Excel::ClassJob >( static_cast<uint8_t>( getClass() ) )->data().WorkIndex;
+  return m_borrowActions[ classJobIndex ];
+}
+
 void Player::learnSong( uint8_t songId, uint32_t itemId )
 {
   uint16_t index;
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 51425acc86..e09a35ac94 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -38,6 +38,7 @@ namespace Sapphire::Entity
 
     using ClassList = std::array< uint16_t, Common::ARRSIZE_CLASSJOB >;
     using ExpList = std::array< uint32_t, Common::ARRSIZE_CLASSJOB >;
+    using BorrowAction = std::array< uint32_t, Common::ARRSIZE_BORROWACTION >;
 
     struct AchievementData {
       std::array< uint8_t, 2048 / 8 > unlockList;
@@ -446,6 +447,10 @@ namespace Sapphire::Entity
     /*! learn an action / update the unlock bitmask. */
     void setRewardFlag( Common::UnlockEntry unlockId );
 
+    void setBorrowAction( uint8_t slot, uint32_t action );
+
+    BorrowAction& getBorrowAction();
+
     /*! learn a song / update the unlock bitmask. */
     void learnSong( uint8_t songId, uint32_t itemId );
 
@@ -966,6 +971,8 @@ namespace Sapphire::Entity
 
     std::array< Common::HuntingLogEntry, Common::ARRSIZE_MONSTERNOTE > m_huntingLogEntries{};
 
+    std::array< BorrowAction, Common::ARRSIZE_CLASSJOB > m_borrowActions{};
+
     FriendListIDVec m_friendList{};
     FriendListDataVec m_friendInviteList{};
 
diff --git a/src/world/Actor/PlayerSql.cpp b/src/world/Actor/PlayerSql.cpp
index 58d3123ca3..4ee1b283ef 100644
--- a/src/world/Actor/PlayerSql.cpp
+++ b/src/world/Actor/PlayerSql.cpp
@@ -258,7 +258,7 @@ bool Sapphire::Entity::Player::loadAchievements()
 bool Sapphire::Entity::Player::loadClassData()
 {
   auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
-  // ClassIdx, Exp, Lvl
+  // ClassIdx, Exp, Lvl, BorrowAction
   auto stmt = db.getPreparedStatement( Db::ZoneDbStatements::CHARA_CLASS_SEL );
   stmt->setUInt64( 1, m_characterId );
   auto res = db.query( stmt );
@@ -268,9 +268,11 @@ bool Sapphire::Entity::Player::loadClassData()
     auto index = res->getUInt16( 1 );
     auto exp = res->getUInt( 2 );
     auto lvl = res->getUInt8( 3 );
+    auto borrowAction = res->getBlobVector( "BorrowAction" );
 
     m_classArray[ index ] = lvl;
     m_expArray[ index ] = exp;
+    memcpy( m_borrowActions[ index ].data(), borrowAction.data(), borrowAction.size() );
   }
 
   return true;
@@ -487,13 +489,19 @@ void Sapphire::Entity::Player::updateDbClass() const
   auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
   auto& exdData = Common::Service< Data::ExdData >::ref();
   uint8_t classJobIndex = exdData.getRow< Excel::ClassJob >( static_cast<uint8_t>( getClass() ) )->data().WorkIndex;
+  auto& borrowAction = m_borrowActions[ classJobIndex ];
 
-  //Exp = ?, Lvl = ? WHERE CharacterId = ? AND ClassIdx = ?
+  //Exp = ?, Lvl = ?, BorrowAction = ? WHERE CharacterId = ? AND ClassIdx = ?
   auto stmtS = db.getPreparedStatement( Db::CHARA_CLASS_UP );
   stmtS->setInt( 1, getExp() );
   stmtS->setInt( 2, getLevel() );
-  stmtS->setUInt64( 3, m_characterId );
-  stmtS->setInt( 4, classJobIndex );
+
+  std::vector< uint8_t > borrowActionVec( borrowAction.size() * 4 );
+  memcpy( borrowActionVec.data(), borrowAction.data(), borrowAction.size() * 4 );
+  stmtS->setBinary( 3, borrowActionVec );
+
+  stmtS->setUInt64( 4, m_characterId );
+  stmtS->setInt( 5, classJobIndex );
   db.execute( stmtS );
 }
 
@@ -581,10 +589,14 @@ void Sapphire::Entity::Player::insertDbClass( const uint8_t classJobIndex, uint8
 {
   auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
   auto stmtClass = db.getPreparedStatement( Db::CHARA_CLASS_INS );
+  auto& borrowAction = m_borrowActions[ classJobIndex ];
+
   stmtClass->setUInt64( 1, m_characterId );
   stmtClass->setInt( 2, classJobIndex );
   stmtClass->setInt( 3, 0 );
   stmtClass->setInt( 4, level );
+  std::vector< uint8_t > borrowActionVec( borrowAction.size() );
+  stmtClass->setBinary( 5, borrowActionVec );
   db.directExecute( stmtClass );
 }
 
diff --git a/src/world/Network/Handlers/PacketCommandHandler.cpp b/src/world/Network/Handlers/PacketCommandHandler.cpp
index 54acc210ec..b95c970353 100644
--- a/src/world/Network/Handlers/PacketCommandHandler.cpp
+++ b/src/world/Network/Handlers/PacketCommandHandler.cpp
@@ -497,6 +497,11 @@ void Sapphire::Network::GameConnection::commandHandler( const Packets::FFXIVARR_
       Network::Util::Player::sendTitleList( player );
       break;
     }
+    case PacketCommand::BORROW_ACTION:
+    {
+      player.setBorrowAction( static_cast< uint8_t >( data.Arg1 ), data.Arg2 );
+      break;
+    }
     case PacketCommand::SET_HOWTO: // Update howtos seen
     {
       player.updateHowtosSeen( data.Arg0 );
diff --git a/src/world/Network/Util/PlayerUtil.cpp b/src/world/Network/Util/PlayerUtil.cpp
index f9f3d61150..45d05d512e 100644
--- a/src/world/Network/Util/PlayerUtil.cpp
+++ b/src/world/Network/Util/PlayerUtil.cpp
@@ -291,10 +291,12 @@ void Util::Player::sendPlayerSetup( Entity::Player& player )
 void Util::Player::sendChangeClass( Entity::Player& player )
 {
   auto classInfo = makeZonePacket< FFXIVIpcChangeClass >( player.getId() );
+  auto& borrowAction = player.getBorrowAction();
   classInfo->data().ClassJob = static_cast< uint8_t >( player.getClass() );
   classInfo->data().Lv = player.getLevel();
   classInfo->data().Lv1 = player.getLevel();
   classInfo->data().Login = player.isLogin() ? 1 : 0;
+  memcpy( &classInfo->data().BorrowAction[ 0 ], borrowAction.data(), borrowAction.size() * 4 );
   server().queueForPlayer( player.getCharacterId(), classInfo );
 }
 

From 5bb8f11881491ae972b077fdf8b3a55eb395a2e3 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Sun, 12 Mar 2023 16:37:33 +0100
Subject: [PATCH 35/45] Add flags to StatusEffects

---
 data/actions/player.json                | 29 +++++++++++++++++++++---
 src/common/Common.h                     | 17 ++++++++++++++
 src/tools/action_parse/main.cpp         |  2 ++
 src/world/Action/Action.cpp             | 20 +++++++++++------
 src/world/Actor/Chara.cpp               | 22 ++++++++++++++++++
 src/world/Actor/Chara.h                 |  4 ++++
 src/world/StatusEffect/StatusEffect.cpp | 30 ++++++++++++++++++++++++-
 src/world/StatusEffect/StatusEffect.h   |  8 +++++++
 8 files changed, 121 insertions(+), 11 deletions(-)

diff --git a/data/actions/player.json b/data/actions/player.json
index 8771bae7fe..d8cc55215b 100644
--- a/data/actions/player.json
+++ b/data/actions/player.json
@@ -629,7 +629,7 @@
   },
   "44": {
     "name": "Vengeance",
-    "potency": 50,
+    "potency": 0,
     "comboPotency": 0,
     "flankPotency": 0,
     "frontPotency": 0,
@@ -638,7 +638,18 @@
     "restorePercentage": 0,
     "nextCombo": [],
     "statuses": {
-      "caster": [],
+      "caster": [
+        {
+          "id": 89,
+          "duration": 20000,
+          "modifiers": [
+            {
+              "modifier": "ReflectPhysical",
+              "value": 50
+            }
+          ]
+        }
+      ],
       "target": []
     }
   },
@@ -1263,7 +1274,19 @@
     "restorePercentage": 0,
     "nextCombo": [],
     "statuses": {
-      "caster": [],
+      "caster": [
+        {
+          "id": 116,
+          "duration": 10000,
+          "flag": 4096,
+          "modifiers": [
+            {
+              "modifier": "CriticalHitPercent",
+              "value": 100
+            }
+          ]
+        }
+      ],
       "target": []
     }
   },
diff --git a/src/common/Common.h b/src/common/Common.h
index 2fbb197cae..da94d9b014 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -922,6 +922,23 @@ namespace Sapphire::Common
     ParryPercent = 1031
   };
 
+  enum class StatusEffectFlag : uint32_t
+  {
+    BuffCategory = 1,
+    DebuffCategory = 2,
+    Permanent = 4,
+    IsGaze = 8,
+    Transfiguration = 16,
+    CanDispel = 32,
+    LockActions = 64,
+    LockControl = 128,
+    LockMovement = 256,
+    Invisibilty = 512,
+    CanStatusOff = 1024,
+    FcBuff = 2048,
+    RemoveOnSuccessfulHit = 4096
+  };
+
   enum struct ActionAspect : uint8_t
   {
     None = 0,   // Doesn't imply unaspected
diff --git a/src/tools/action_parse/main.cpp b/src/tools/action_parse/main.cpp
index dee585cc42..a5af43f904 100644
--- a/src/tools/action_parse/main.cpp
+++ b/src/tools/action_parse/main.cpp
@@ -41,6 +41,7 @@ struct StatusEntry
 {
   uint16_t id;
   int32_t duration;
+  uint32_t flag;
   std::vector< StatusModifier > modifiers;
 };
 
@@ -78,6 +79,7 @@ void to_json( nlohmann::ordered_json& j, const StatusEntry& statusEntry )
   j = nlohmann::ordered_json{
     { "id", statusEntry.id },
     { "duration", statusEntry.duration },
+    { "flag", statusEntry.flag },
     { "modifiers", statusEntry.modifiers }
   };
 }
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 190965eb2e..2f8b6bc5b1 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -88,6 +88,7 @@ bool Action::Action::init()
   m_cooldownGroup = m_actionData->data().RecastGroup;
   m_range = m_actionData->data().SelectRange;
   m_effectRange = m_actionData->data().EffectRange;
+  m_effectWidth = m_actionData->data().EffectWidth;
   m_category = static_cast< Common::ActionCategory >( m_actionData->data().Category );
   m_castType = static_cast< Common::CastType >( m_actionData->data().EffectType );
   m_aspect = static_cast< Common::ActionAspect >( m_actionData->data().AttackType );
@@ -119,7 +120,7 @@ bool Action::Action::init()
   m_primaryCostType = static_cast< Common::ActionPrimaryCostType >( m_actionData->data().CostType );
   m_primaryCost = m_actionData->data().CostValue;
 
-  /*if( !m_actionData->targetArea )
+  if( !m_actionData->data().SelectGround )
   {
     // override pos to target position
     // todo: this is kinda dirty
@@ -131,7 +132,7 @@ bool Action::Action::init()
         break;
       }
     }
-  }*/
+  }
 
   // todo: add missing rows for secondaryCostType/secondaryCostType and rename the current rows to primaryCostX
 
@@ -607,11 +608,17 @@ void Action::Action::handleAction()
     }
   }
 
-  if( m_lutEntry.statuses.caster.size() > 0 || m_lutEntry.statuses.target.size() > 0 )
-    handleStatusEffects();
+  // If we hit an enemy
+  if( m_hitActors.size() > 0 && getHitChara()->getObjKind() != m_pSource->getObjKind() )
+  {
+    m_pSource->removeStatusEffectByFlag( Common::StatusEffectFlag::RemoveOnSuccessfulHit );
+  }
 
   handleJobAction();
 
+  if( m_lutEntry.statuses.caster.size() > 0 || m_lutEntry.statuses.target.size() > 0 )
+    handleStatusEffects();
+
   m_effectBuilder->buildAndSendPackets( m_hitActors );
 
   // TODO: disabled, reset kills our queued actions
@@ -630,7 +637,7 @@ void Action::Action::handleStatusEffects()
     for( auto& status : m_lutEntry.statuses.caster )
     {
       applyStatusEffectSelf( status.id );
-      m_pSource->addStatusEffectByIdIfNotExist( status.id, status.duration, *m_pSource, status.modifiers );
+      m_pSource->addStatusEffectByIdIfNotExist( status.id, status.duration, *m_pSource, status );
     }
   }
 
@@ -642,7 +649,7 @@ void Action::Action::handleStatusEffects()
       for( auto& status : m_lutEntry.statuses.target )
       {
         getEffectbuilder()->applyStatusEffect( actor, status.id, 0 );
-        actor->addStatusEffectByIdIfNotExist( status.id, status.duration, *m_pSource, status.modifiers );
+        actor->addStatusEffectByIdIfNotExist( status.id, status.duration, *m_pSource, status );
       }
 
       if( actor->getStatusEffectMap().size() > 0 )
@@ -866,7 +873,6 @@ void Action::Action::addDefaultActorFilters()
   switch( m_castType )
   {
     case Common::CastType::SingleTarget:
-    case Common::CastType::Type3:
     {
       auto filter = std::make_shared< World::Util::ActorFilterSingleTarget >( static_cast< uint32_t >( m_targetId ) );
       addActorFilter( filter );
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 49f83f3d4f..442e212fd2 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -572,6 +572,17 @@ void Sapphire::Entity::Chara::addStatusEffectByIdIfNotExist( uint32_t id, int32_
   addStatusEffect( effect );
 }
 
+void Sapphire::Entity::Chara::addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Chara& source,
+                                                             World::Action::StatusEntry& statusEntry, uint16_t param )
+{
+  if( hasStatusEffect( id ) )
+    return;
+
+  auto effect = StatusEffect::make_StatusEffect( id, source.getAsChara(), getAsChara(), duration, statusEntry, 3000 );
+  effect->setParam( param );
+  addStatusEffect( effect );
+}
+
 int8_t Sapphire::Entity::Chara::getStatusEffectFreeSlot()
 {
   int8_t freeEffectSlot = -1;
@@ -614,6 +625,17 @@ void Sapphire::Entity::Chara::removeSingleStatusEffectById( uint32_t id )
   }
 }
 
+void Sapphire::Entity::Chara::removeStatusEffectByFlag( Common::StatusEffectFlag flag )
+{
+  for( auto effectIt = m_statusEffectMap.begin(); effectIt != m_statusEffectMap.end(); )
+  {
+    if( effectIt->second->getFlag() & static_cast< uint32_t >( flag ) )
+      effectIt = removeStatusEffect( effectIt->first );
+    else
+      ++effectIt;
+  }
+}
+
 std::map< uint8_t, Sapphire::StatusEffect::StatusEffectPtr >::iterator Sapphire::Entity::Chara::removeStatusEffect( uint8_t effectSlotId, bool sendOrder )
 {
   auto pEffectIt = m_statusEffectMap.find( effectSlotId );
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index df81d62669..77ccdc25a4 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -114,6 +114,8 @@ namespace Sapphire::Entity
 
     void removeSingleStatusEffectById( uint32_t id );
 
+    void removeStatusEffectByFlag( Common::StatusEffectFlag flag );
+
     void updateStatusEffects();
 
     bool hasStatusEffect( uint32_t id );
@@ -143,6 +145,8 @@ namespace Sapphire::Entity
     void addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Chara& source, uint16_t param = 0 );
     void addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Chara& source, std::vector< World::Action::StatusModifier > modifiers,
                                         uint16_t param = 0 );
+    void addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Chara& source, World::Action::StatusEntry& statusEntry,
+                                        uint16_t param = 0 );
 
     // remove a status effect by id
     void removeSingleStatusEffectFromId( uint32_t id );
diff --git a/src/world/StatusEffect/StatusEffect.cpp b/src/world/StatusEffect/StatusEffect.cpp
index 56d47746f6..56c41a1549 100644
--- a/src/world/StatusEffect/StatusEffect.cpp
+++ b/src/world/StatusEffect/StatusEffect.cpp
@@ -28,6 +28,14 @@ Sapphire::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPt
   m_statusModifiers = std::move( modifiers );
 }
 
+Sapphire::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor,
+                                                    uint32_t duration, World::Action::StatusEntry& statusEntry, uint32_t tickRate ) :
+  StatusEffect( id, sourceActor, targetActor, duration, tickRate )
+{
+  m_statusModifiers = statusEntry.modifiers;
+  m_flag |= statusEntry.flag;
+}
+
 Sapphire::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor,
                                                     uint32_t duration, uint32_t tickRate ) :
   m_id( id ),
@@ -37,7 +45,8 @@ Sapphire::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPt
   m_modifiers( 0 ),
   m_startTime( 0 ),
   m_tickRate( tickRate ),
-  m_lastTick( 0 )
+  m_lastTick( 0 ),
+  m_flag( 0 )
 {
   auto& exdData = Common::Service< Data::ExdData >::ref();
   auto entry = exdData.getRow< Excel::Status >( id );
@@ -52,6 +61,15 @@ Sapphire::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPt
   Util::eraseAll( m_name, '-' );
   Util::eraseAll( m_name, '(' );
   Util::eraseAll( m_name, ')' );
+
+  m_flag |= entry->data().Category;
+  m_flag |= static_cast< uint32_t >( entry->data().Forever ) << static_cast< uint32_t >( Common::StatusEffectFlag::Permanent );
+  m_flag |= static_cast< uint32_t >( entry->data().CanOff ) << static_cast< uint32_t >( Common::StatusEffectFlag::CanStatusOff );
+  m_flag |= static_cast< uint32_t >( entry->data().NotAction ) << static_cast< uint32_t >( Common::StatusEffectFlag::LockActions );
+  m_flag |= static_cast< uint32_t >( entry->data().NotControl ) << static_cast< uint32_t >( Common::StatusEffectFlag::LockControl );
+  m_flag |= static_cast< uint32_t >( entry->data().NotMove ) << static_cast< uint32_t >( Common::StatusEffectFlag::LockMovement );
+  m_flag |= static_cast< uint32_t >( entry->data().NotLookAt ) << static_cast< uint32_t >( Common::StatusEffectFlag::IsGaze );
+  m_flag |= static_cast< uint32_t >( entry->data().FcAction ) << static_cast< uint32_t >( Common::StatusEffectFlag::FcBuff );
 }
 
 
@@ -192,6 +210,16 @@ uint64_t Sapphire::StatusEffect::StatusEffect::getStartTimeMs() const
   return m_startTime;
 }
 
+uint32_t Sapphire::StatusEffect::StatusEffect::getFlag() const
+{
+  return m_flag;
+}
+
+void Sapphire::StatusEffect::StatusEffect::setFlag( uint32_t flag )
+{
+  m_flag = flag;
+}
+
 void Sapphire::StatusEffect::StatusEffect::setLastTick( uint64_t lastTick )
 {
   m_lastTick = lastTick;
diff --git a/src/world/StatusEffect/StatusEffect.h b/src/world/StatusEffect/StatusEffect.h
index 9b750121e5..ef77a9c9b5 100644
--- a/src/world/StatusEffect/StatusEffect.h
+++ b/src/world/StatusEffect/StatusEffect.h
@@ -14,6 +14,9 @@ class StatusEffect
   StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor,
                 uint32_t duration, std::vector< World::Action::StatusModifier >& modifiers, uint32_t tickRate );
 
+  StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor,
+                uint32_t duration, World::Action::StatusEntry& statusEntry, uint32_t tickRate );
+
   StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor,
                 uint32_t duration, uint32_t tickRate );
 
@@ -47,10 +50,14 @@ class StatusEffect
 
   uint16_t getParam() const;
 
+  uint32_t getFlag() const;
+
   void setLastTick( uint64_t lastTick );
 
   void setParam( uint16_t param );
 
+  void setFlag( uint32_t flag );
+
   void registerTickEffect( Common::ParamModifier type, uint32_t param );
 
   std::pair< Common::ParamModifier, uint32_t > getTickEffect();
@@ -66,6 +73,7 @@ class StatusEffect
   uint32_t m_tickRate;
   uint64_t m_lastTick;
   uint16_t m_param;
+  uint32_t m_flag;
   std::string m_name;
   std::pair< Common::ParamModifier, uint32_t > m_currTickEffect;
   std::vector< World::Action::StatusModifier > m_statusModifiers;

From 293c281ebab27cd6d61ad6a2e1ff60982a50bb24 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Sun, 12 Mar 2023 16:38:09 +0100
Subject: [PATCH 36/45] Some exd struct fixes

---
 deps/datReader/Exd/Structs.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/deps/datReader/Exd/Structs.h b/deps/datReader/Exd/Structs.h
index 078d26fa42..1d1de7b052 100644
--- a/deps/datReader/Exd/Structs.h
+++ b/deps/datReader/Exd/Structs.h
@@ -391,13 +391,14 @@ namespace Excel
     uint8_t EffectWidth;
     uint8_t CostType;
     uint8_t Cond;
-    uint8_t RecastGroup;
     uint8_t Element;
     uint8_t ProcStatus;
-    uint8_t UseClassJob;
+    uint8_t ClassJobCategory;
+    uint8_t RecastGroup;
     uint8_t Init;
     uint8_t Omen;
-    int8_t Learn;
+    uint8_t Learn;
+    int8_t UseClassJob;
     int8_t SelectRange;
     int8_t SelectCorpse;
     int8_t AttackType;
@@ -429,7 +430,7 @@ namespace Excel
     uint8_t HideCastBar : 1;
     uint8_t IsTargetLine : 1;
 
-    int8_t padding0;
+    int8_t unknown : 8;
   };
 
   /* 75653 */
@@ -2053,7 +2054,8 @@ namespace Excel
     uint8_t NotControl : 1;
     uint8_t NotAction : 1;
     uint8_t NotMove : 1;
-    uint8_t padding0 : 6;
+    uint8_t padding0 : 5;
+    uint8_t CanOff : 1;
     uint8_t SemiTransparent : 1;
     uint8_t FcAction : 1;
     int8_t padding1[2];

From 49486f5d02f4143065baeef6cadefb6a1620d844 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Sun, 12 Mar 2023 16:45:52 +0100
Subject: [PATCH 37/45] Some aoe work

---
 src/common/Common.h             | 4 ++--
 src/world/Action/Action.h       | 1 +
 src/world/Manager/ActionMgr.cpp | 7 -------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index da94d9b014..6cc4c79153 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -1872,8 +1872,8 @@ namespace Sapphire::Common
   {
     SingleTarget = 1,
     CircularAOE = 2,
-    Type3 = 3, // another single target? no idea how to call it
-    RectangularAOE = 4,
+    RectangularAOE = 3,
+    ConeAOE = 4,
     CircularAoEPlaced = 7
   };
 
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index 66a680f92d..0e00a6a1d9 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -193,6 +193,7 @@ namespace Sapphire::World::Action
     uint8_t m_cooldownGroup{};
     int8_t m_range{};
     uint8_t m_effectRange{};
+    uint8_t m_effectWidth{};
     uint8_t m_xAxisModifier{};
     Common::ActionAspect m_aspect;
     Common::CastType m_castType;
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index 27605f1ac0..14c317455e 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -71,13 +71,6 @@ void ActionMgr::handleTargetedPlayerAction( Entity::Player& player, uint32_t act
   if( !action->init() )
     return;
 
-  // cancel any aoe actions casted with this packet
-  if( actionData->data().EffectRange )
-  {
-    action->interrupt();
-    return;
-  }
-
   bootstrapAction( player, action, actionData );
 }
 

From 63d9ce5ba4da4bc64e3a1f9b355a5161b5349391 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Sun, 12 Mar 2023 16:46:14 +0100
Subject: [PATCH 38/45] Add flags to lut

---
 src/world/Action/ActionLut.h     | 1 +
 src/world/Action/ActionLutData.h | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/world/Action/ActionLut.h b/src/world/Action/ActionLut.h
index bd0fbe3ff0..258658547f 100644
--- a/src/world/Action/ActionLut.h
+++ b/src/world/Action/ActionLut.h
@@ -18,6 +18,7 @@ namespace Sapphire::World::Action
   {
     uint16_t id;
     int32_t duration;
+    uint32_t flag;
     std::vector< StatusModifier > modifiers;
   };
 
diff --git a/src/world/Action/ActionLutData.h b/src/world/Action/ActionLutData.h
index 99e78f0326..22cf62bf28 100644
--- a/src/world/Action/ActionLutData.h
+++ b/src/world/Action/ActionLutData.h
@@ -33,6 +33,8 @@ namespace Sapphire::World::Action
   {
     j.at( "id" ).get_to( statusEntry.id );
     j.at( "duration" ).get_to( statusEntry.duration );
+    if( j.contains( "flag" ) )
+      j.at( "flag" ).get_to( statusEntry.flag );
     if( j.contains( "modifiers" ) )
       j.at( "modifiers" ).get_to( statusEntry.modifiers );
   }

From 3f30027742778c5457df469f15a5af433d725dac Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Sun, 12 Mar 2023 16:46:39 +0100
Subject: [PATCH 39/45] Add missing changeclass

---
 src/world/Actor/Player.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 2ad26bf276..9e2f6510bd 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -733,6 +733,7 @@ void Player::setClassJob( Common::ClassJob classJob )
 
   m_tp = 0;
 
+  Network::Util::Player::sendChangeClass( *this );
   Network::Util::Player::sendStatusUpdate( *this );
   Network::Util::Player::sendActorControl( getInRangePlayerIds( true ), *this, ClassJobChange, 4 );
   Network::Util::Player::sendHudParam( *this );

From a92076b42d2f801bc89ec36523a52e8728a536c7 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Sun, 12 Mar 2023 20:05:34 +0100
Subject: [PATCH 40/45] Add SET_STATUS_ME to ActionIntegrity

---
 src/world/Task/ActionIntegrityTask.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Task/ActionIntegrityTask.cpp b/src/world/Task/ActionIntegrityTask.cpp
index 40a75c462e..00295a51b0 100644
--- a/src/world/Task/ActionIntegrityTask.cpp
+++ b/src/world/Task/ActionIntegrityTask.cpp
@@ -49,7 +49,7 @@ void ActionIntegrityTask::execute()
   int statusIdx = 0;
   for( auto& actionResult : m_results )
   {
-    if( actionResult->getCalcResultParam().Type == Common::CALC_RESULT_TYPE_SET_STATUS )
+    if( actionResult->getCalcResultParam().Type == Common::CALC_RESULT_TYPE_SET_STATUS || actionResult->getCalcResultParam().Type == Common::CALC_RESULT_TYPE_SET_STATUS_ME )
     {
       auto& status = data.Status[ statusIdx++ ];
       auto pEffect = actionResult->getStatusEffect();

From f001ee11b6f29efe9889ab7695ed38878cfc7f9e Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Sun, 12 Mar 2023 22:22:02 +0100
Subject: [PATCH 41/45] Improve offensive action check

---
 src/world/Action/Action.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index a6829ddd69..6edbb67566 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -513,7 +513,7 @@ void Action::Action::applyStatusEffectSelf( StatusEntry& statusEntry, bool shoul
 void Action::Action::applyStatusEffectSelf( uint16_t statusId, int32_t duration, bool shouldOverride,
                                             std::vector< StatusModifier > modifiers, uint8_t param )
 {
-  if( m_hitActors.size() > 0 )
+  if( m_hitActors.size() > 0 && m_hitActors[ 0 ]->getObjKind() != m_pSource->getObjKind() )
     getActionResultBuilder()->applyStatusEffect( m_hitActors[ 0 ], statusId, duration, param, modifiers, shouldOverride, true );
   else
     getActionResultBuilder()->applyStatusEffect( m_pSource, statusId, duration, param, modifiers, shouldOverride );

From db9d10630ce2130de295dfb0d05be2571dc9f721 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Mon, 13 Mar 2023 12:03:14 +0100
Subject: [PATCH 42/45] Add flag to overloaded applyStatusEffectSelf

---
 src/world/Action/ActionResult.cpp        | 1 +
 src/world/Action/ActionResultBuilder.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/world/Action/ActionResult.cpp b/src/world/Action/ActionResult.cpp
index c7b0592603..84fc50e3dd 100644
--- a/src/world/Action/ActionResult.cpp
+++ b/src/world/Action/ActionResult.cpp
@@ -112,6 +112,7 @@ void ActionResult::applyStatusEffectSelf( uint32_t id, int32_t duration, uint8_t
   m_result.Value = static_cast< int16_t >( id );
   m_result.Arg2 = param;
   m_result.Type = Common::ActionEffectType::CALC_RESULT_TYPE_SET_STATUS_ME;
+  m_result.Flag = static_cast< uint8_t >( Common::ActionResultFlag::EffectOnSource );
 
   m_bOverrideStatus = shouldOverride;
   m_pStatus = Sapphire::StatusEffect::make_StatusEffect( id, m_target, m_target, duration, modifiers, flag, 3000 );
diff --git a/src/world/Action/ActionResultBuilder.cpp b/src/world/Action/ActionResultBuilder.cpp
index 273e1dab7f..bedd3a2ad0 100644
--- a/src/world/Action/ActionResultBuilder.cpp
+++ b/src/world/Action/ActionResultBuilder.cpp
@@ -104,7 +104,7 @@ void ActionResultBuilder::applyStatusEffectSelf( uint16_t statusId, uint32_t dur
 }
 
 void ActionResultBuilder::applyStatusEffectSelf( uint16_t statusId, uint32_t duration, uint8_t param, std::vector< World::Action::StatusModifier > modifiers,
-                                                 uint32_t flag = 0, bool shouldOverride )
+                                                 uint32_t flag, bool shouldOverride )
 {
   ActionResultPtr nextResult = make_ActionResult( m_sourceChara, 0 );
   nextResult->applyStatusEffectSelf( statusId, duration, param, modifiers, flag, shouldOverride );

From 434eaa6163c23fd3c934ae913dca20b7af0f1197 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Mon, 13 Mar 2023 12:11:20 +0100
Subject: [PATCH 43/45] indentation fix

---
 src/world/Action/ActionResult.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Action/ActionResult.cpp b/src/world/Action/ActionResult.cpp
index 84fc50e3dd..0a0e8d68c2 100644
--- a/src/world/Action/ActionResult.cpp
+++ b/src/world/Action/ActionResult.cpp
@@ -107,7 +107,7 @@ void ActionResult::applyStatusEffectSelf( uint32_t id, int32_t duration, uint8_t
 }
 
 void ActionResult::applyStatusEffectSelf( uint32_t id, int32_t duration, uint8_t param, std::vector< World::Action::StatusModifier > modifiers,
-                            uint32_t flag, bool shouldOverride )
+                                          uint32_t flag, bool shouldOverride )
 {
   m_result.Value = static_cast< int16_t >( id );
   m_result.Arg2 = param;

From 83590fc5cfcc8e7540f90d37d0b438a09b43475e Mon Sep 17 00:00:00 2001
From: Rushi <44952533+Skyliegirl33@users.noreply.github.com>
Date: Sun, 23 Jul 2023 19:23:20 +0200
Subject: [PATCH 44/45] Some calculation work

---
 src/world/Math/CalcStats.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index af58dad1b1..a3236edc4e 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -94,7 +94,7 @@ std::uniform_int_distribution< std::mt19937::result_type > CalcStats::range100(
    Big thanks to the Theoryjerks group!
 
    NOTE:
-   Formulas here shouldn't be considered final. It's possible that the formula it was based on is correct but 
+   Formulas here shouldn't be considered final. It's possible that the formula it was based on is correct but
    wasn't implemented correctly here, or approximated things due to limited knowledge of how things work in retail.
    It's also possible that we're using formulas that were correct for previous patches, but not the current version.
 
@@ -144,12 +144,15 @@ uint32_t CalcStats::calculateMaxHp( Player& player )
   uint16_t hpMod = paramGrowthInfo->data().ParamBase;
   uint16_t jobModHp = classInfo->data().Hp;
   float approxBaseHp = 0.0f; // Read above
+  float hpModPercent = player.getModifier( Common::ParamModifier::HPPercent );
 
   approxBaseHp = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::HP ] );
 
   auto result = static_cast< uint32_t >( floor( jobModHp * ( approxBaseHp / 100.0f ) ) +
                                          floor( hpMod / 100.0f * ( vitStat - baseStat ) ) );
 
+  result *= hpModPercent;
+
   return result;
 }
 
@@ -624,6 +627,7 @@ std::pair< float, Sapphire::Common::ActionHitSeverityType > CalcStats::calcActio
   auto wd = weaponDamage( chara, wepDmg );
   auto ap = getPrimaryAttackPower( chara );
   auto det = determination( chara );
+  auto damageDealtMod = chara.getModifier( Common::ParamModifier::DamageDealtPercent );
 
   auto factor = Common::Util::trunc( pot * wd * ap * det, 0 );
   Sapphire::Common::ActionHitSeverityType hitType = Sapphire::Common::ActionHitSeverityType::NormalDamage;
@@ -646,11 +650,14 @@ std::pair< float, Sapphire::Common::ActionHitSeverityType > CalcStats::calcActio
 
   // todo: buffs
 
+  factor *= damageDealtMod;
+
   constexpr auto format = "dmg: pot: {} ({}) wd: {} ({}) ap: {} det: {}  = {}";
 
   if( auto player = const_cast< Entity::Chara& >( chara ).getAsPlayer() )
   {
     PlayerMgr::sendDebug( *player, format, pot, ptc, wd, wepDmg, ap, det, factor );
+    PlayerMgr::sendDebug( *player, "DamageDealtPercent: {}", damageDealtMod );
   }
   else
   {
@@ -683,4 +690,4 @@ std::pair< float, Sapphire::Common::ActionHitSeverityType > CalcStats::calcActio
 uint32_t CalcStats::primaryStatValue( const Sapphire::Entity::Chara& chara )
 {
   return chara.getStatValue( chara.getPrimaryStat() );
-}
\ No newline at end of file
+}

From cc63ac182fdbda3cba3a973399ef9282f0374146 Mon Sep 17 00:00:00 2001
From: Rushi <44952533+Skyliegirl33@users.noreply.github.com>
Date: Thu, 20 Jun 2024 20:39:19 +0200
Subject: [PATCH 45/45] Null-check ActionResultBuilder

---
 src/scripts/action/war/ActionInnerBeast.cpp | 9 +++++----
 src/scripts/action/war/ActionUnchained.cpp  | 5 +++--
 src/world/Action/Action.cpp                 | 9 +++++++--
 src/world/Action/Job/Warrior.cpp            | 9 +++++++--
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/scripts/action/war/ActionInnerBeast.cpp b/src/scripts/action/war/ActionInnerBeast.cpp
index 3c25264427..d4193e4d4a 100644
--- a/src/scripts/action/war/ActionInnerBeast.cpp
+++ b/src/scripts/action/war/ActionInnerBeast.cpp
@@ -22,18 +22,19 @@ class ActionInnerBeast : public Sapphire::ScriptAPI::ActionScript
     auto pPlayer = action.getSourceChara()->getAsPlayer();
     auto pSource = action.getSourceChara();
     auto pTarget = action.getHitChara();
+    auto pActionBuilder = action.getActionResultBuilder();
 
-    if( !pPlayer )
+    if( !pPlayer || !pActionBuilder )
       return;
     
     if( auto status = pPlayer->getStatusEffectById( Defiance ); status )
       status->setModifier( Common::ParamModifier::DamageDealtPercent, 0 );
 
     auto dmg = action.calcDamage( Potency );
-    action.getActionResultBuilder()->damage( pSource, pTarget, dmg.first, dmg.second );
-    action.getActionResultBuilder()->heal( pTarget, pSource, dmg.first, Common::CalcResultType::TypeRecoverHp, Common::ActionResultFlag::EffectOnSource );
+    pActionBuilder->damage( pSource, pTarget, dmg.first, dmg.second );
+    pActionBuilder->heal( pTarget, pSource, dmg.first, Common::CalcResultType::TypeRecoverHp, Common::ActionResultFlag::EffectOnSource );
 
-    action.getActionResultBuilder()->applyStatusEffectSelf( InnerBeast, 15000, 0, { StatusModifier{ Common::ParamModifier::DamageTakenPercent, -20 } } );
+    pActionBuilder->applyStatusEffectSelf( InnerBeast, 15000, 0, { StatusModifier{ Common::ParamModifier::DamageTakenPercent, -20 } } );
     
     if( !pPlayer->hasStatusEffect( Unchained ) )
     {
diff --git a/src/scripts/action/war/ActionUnchained.cpp b/src/scripts/action/war/ActionUnchained.cpp
index e201fa3d6b..640f024a28 100644
--- a/src/scripts/action/war/ActionUnchained.cpp
+++ b/src/scripts/action/war/ActionUnchained.cpp
@@ -18,14 +18,15 @@ class ActionUnchained : public Sapphire::ScriptAPI::ActionScript
   void onExecute( Sapphire::World::Action::Action& action ) override
   {
     auto pPlayer = action.getSourceChara()->getAsPlayer();
+    auto pActionBuilder = action.getActionResultBuilder();
 
-    if( !pPlayer )
+    if( !pPlayer || !pActionBuilder )
       return;
 
     if( auto status = pPlayer->getStatusEffectById( Defiance ); status )
       status->setModifier( Common::ParamModifier::DamageDealtPercent, 0 );
 
-    action.getActionResultBuilder()->applyStatusEffectSelf( Unchained, 20000, 0 );
+    pActionBuilder->applyStatusEffectSelf( Unchained, 20000, 0 );
   }
 };
 
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 3bf5850334..8afe58091b 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -611,6 +611,11 @@ void Action::Action::buildActionResults()
 
 void Action::Action::handleStatusEffects()
 {
+  auto pActionBuilder = getActionResultBuilder();
+
+  if( !pActionBuilder )
+    return;
+
   if( isComboAction() && !isCorrectCombo() )
     return;
 
@@ -619,7 +624,7 @@ void Action::Action::handleStatusEffects()
   {
     for( auto& status : m_lutEntry.statuses.caster )
     {
-      getActionResultBuilder()->applyStatusEffectSelf( status.id, status.duration, 0, status.modifiers, status.flag, true );
+      pActionBuilder->applyStatusEffectSelf( status.id, status.duration, 0, status.modifiers, status.flag, true );
     }
   }
 
@@ -630,7 +635,7 @@ void Action::Action::handleStatusEffects()
     {
       for( auto& status : m_lutEntry.statuses.target )
       {
-        getActionResultBuilder()->applyStatusEffect( actor, status.id, status.duration, 0, status.modifiers, status.flag, true );
+        pActionBuilder->applyStatusEffect( actor, status.id, status.duration, 0, status.modifiers, status.flag, true );
       }
 
       if( actor->getStatusEffectMap().size() > 0 )
diff --git a/src/world/Action/Job/Warrior.cpp b/src/world/Action/Job/Warrior.cpp
index d6c341b2db..4ee8a485c5 100644
--- a/src/world/Action/Job/Warrior.cpp
+++ b/src/world/Action/Job/Warrior.cpp
@@ -33,6 +33,11 @@ void Warrior::handleWrath( Entity::Player& player, Action& action )
   auto parry = 2;
   auto asChara = player.getAsChara();
 
+  auto pActionBuilder = action.getActionResultBuilder();
+    
+  if( !pActionBuilder )
+    return;
+
   if( player.hasStatusEffect( Wrath ) )
   {
     player.replaceSingleStatusEffectById( Wrath );
@@ -59,7 +64,7 @@ void Warrior::handleWrath( Entity::Player& player, Action& action )
   }
 
   if( !player.hasStatusEffect( Infuriated ) )
-  {
-    action.getActionResultBuilder()->applyStatusEffectSelf( effectToApply, 30000, 0, { StatusModifier{ Common::ParamModifier::ParryPercent, parry } }, 0, false );
+  {    
+    pActionBuilder->applyStatusEffectSelf( effectToApply, 30000, 0, { StatusModifier{ Common::ParamModifier::ParryPercent, parry } }, 0, false );
   }
 }
\ No newline at end of file