Merge pull request #9818 from sruon/resonance_subtarget

[core] Mobskills only trigger resonance on main target

Author: Xaver-DaRed

src/map/entities/battleentity.cpp

@@ -2847,18 +2847,22 @@ void CBattleEntity::OnMobSkillFinished(CMobSkillState& state, action_t& action)
             result.resolution = ActionResolution::Hit;
         }
 
-        if (result.resolution != ActionResolution::Miss && result.resolution != ActionResolution::Parry)
+        if (first)
         {
-            if (first && PTargetFound->health.hp > 0 && PSkill->getPrimarySkillchain() != 0)
+            bool isNegated = result.resolution == ActionResolution::Miss || result.resolution == ActionResolution::Parry;
+            if (!isNegated)
             {
-                const auto effect = battleutils::GetSkillChainEffect(PTargetFound, PSkill->getPrimarySkillchain(), PSkill->getSecondarySkillchain(), PSkill->getTertiarySkillchain());
-                if (effect != ActionProcSkillChain::None)
+                if (PTargetFound->health.hp > 0 && PSkill->getPrimarySkillchain() != 0)
                 {
-                    result.recordSkillchain(effect, battleutils::TakeSkillchainDamage(this, PTargetFound, result.param, nullptr));
+                    const auto effect = battleutils::GetSkillChainEffect(PTargetFound, PSkill->getPrimarySkillchain(), PSkill->getSecondarySkillchain(), PSkill->getTertiarySkillchain());
+                    if (effect != ActionProcSkillChain::None)
+                    {
+                        result.recordSkillchain(effect, battleutils::TakeSkillchainDamage(this, PTargetFound, result.param, nullptr));
+                    }
                 }
-
-                first = false;
             }
+
+            first = false;
         }
 
         if (PSkill->getValidTargets() & TARGET_ENEMY)

src/map/entities/charentity.cpp

@@ -1623,7 +1623,8 @@ void CCharEntity::OnWeaponSkillFinished(CWeaponSkillState& state, action_t& acti
                 // On retail, weaponskills will contain 0x08, 0x10 (HIT, ABILITY) on hit and may include the following:
                 // 0x01, 0x02, 0x04 (MISS, GUARDED, BLOCK)
                 // TODO: refactor this so lua returns the number of hits so we don't have to check the reaction bits.
-                if (actionResult.resolution != ActionResolution::Miss)
+                bool isNegated = actionResult.resolution == ActionResolution::Miss || actionResult.resolution == ActionResolution::Parry;
+                if (!isNegated)
                 {
                     int wspoints = settings::get<uint8>("map.WS_POINTS_BASE");