From 25d9c80067a0d91b5820fc131da70ae8bb4d901b Mon Sep 17 00:00:00 2001
From: Kuyondo <Kindi@DESKTOP-7D8MM3O>
Date: Thu, 10 Jul 2025 23:46:22 +0800
Subject: [PATCH] Don't play vfx and sound on fully resisted debuffs

---
 apps/openmw/mwmechanics/activespells.cpp |  8 +++-----
 apps/openmw/mwmechanics/spelleffects.cpp | 11 +++++++----
 apps/openmw/mwmechanics/spelleffects.hpp |  3 ++-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 0f361f7ffc..270faf8598 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -273,13 +273,14 @@ namespace MWMechanics
         }
 
         bool updateSpellWindow = false;
+        bool playNonLooping = false;
         if (ptr.getClass().hasInventoryStore(ptr)
             && !(creatureStats.isDead() && !creatureStats.isDeathAnimationFinished()))
         {
             auto& store = ptr.getClass().getInventoryStore(ptr);
             if (store.getInvListener() != nullptr)
             {
-                bool playNonLooping = !store.isFirstEquip();
+                playNonLooping = !store.isFirstEquip();
                 const auto world = MWBase::Environment::get().getWorld();
                 for (int slotIndex = 0; slotIndex < MWWorld::InventoryStore::Slots; slotIndex++)
                 {
@@ -307,9 +308,6 @@ namespace MWMechanics
                     applyPurges(ptr);
                     ActiveSpellParams& params = mSpells.emplace_back(ActiveSpellParams{ *slot, enchantment, ptr });
                     params.setActiveSpellId(MWBase::Environment::get().getESMStore()->generateId());
-                    for (const auto& effect : params.mEffects)
-                        MWMechanics::playEffects(
-                            ptr, *world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId), playNonLooping);
                     updateSpellWindow = true;
                 }
             }
@@ -327,7 +325,7 @@ namespace MWMechanics
             std::optional<ActiveSpellParams> reflected;
             for (auto it = spellIt->mEffects.begin(); it != spellIt->mEffects.end();)
             {
-                auto result = applyMagicEffect(ptr, caster, *spellIt, *it, duration);
+                auto result = applyMagicEffect(ptr, caster, *spellIt, *it, duration, playNonLooping);
                 if (result.mType == MagicApplicationResult::Type::REFLECTED)
                 {
                     if (!reflected)
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 3d1a5ed84e..99e5a09481 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -914,7 +914,7 @@ namespace MWMechanics
     }
 
     MagicApplicationResult applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster,
-        ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, float dt)
+        ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, float dt, bool playNonLooping)
     {
         const auto world = MWBase::Environment::get().getWorld();
         bool invalid = false;
@@ -1032,9 +1032,12 @@ namespace MWMechanics
                 oldMagnitude = effect.mMagnitude;
             else
             {
-                if (!spellParams.hasFlag(ESM::ActiveSpells::Flag_Equipment)
-                    && !spellParams.hasFlag(ESM::ActiveSpells::Flag_Lua))
-                    playEffects(target, *magicEffect, spellParams.hasFlag(ESM::ActiveSpells::Flag_Temporary));
+                bool isTemporary = spellParams.hasFlag(ESM::ActiveSpells::Flag_Temporary);
+                bool isEquipment = spellParams.hasFlag(ESM::ActiveSpells::Flag_Equipment);
+
+                if (!spellParams.hasFlag(ESM::ActiveSpells::Flag_Lua))
+                    playEffects(target, *magicEffect, (isTemporary || (isEquipment && playNonLooping)));
+
                 if (effect.mEffectId == ESM::MagicEffect::Soultrap && !target.getClass().isNpc()
                     && target.getType() == ESM::Creature::sRecordId
                     && target.get<ESM::Creature>()->mBase->mData.mSoul == 0 && caster == getPlayer())
diff --git a/apps/openmw/mwmechanics/spelleffects.hpp b/apps/openmw/mwmechanics/spelleffects.hpp
index 2dafedf31f..d9b05535a9 100644
--- a/apps/openmw/mwmechanics/spelleffects.hpp
+++ b/apps/openmw/mwmechanics/spelleffects.hpp
@@ -28,7 +28,8 @@ namespace MWMechanics
 
     // Applies a tick of a single effect. Returns true if the effect should be removed immediately
     MagicApplicationResult applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster,
-        ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, float dt);
+        ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, float dt,
+        bool playNonLoopingEffect = true);
 
     // Undoes permanent effects created by ESM::MagicEffect::AppliedOnce
     void onMagicEffectRemoved(