Merge pull request #1661

apps/openmw/mwmechanics/combat.cpp

@@ -1,6 +1,7 @@
 #include "combat.hpp"
 
 #include <components/misc/rng.hpp>
+#include <components/settings/settings.hpp>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
 
@@ -155,7 +156,11 @@ namespace MWMechanics
 
         if (!(weapon.get<ESM::Weapon>()->mBase->mData.mFlags & ESM::Weapon::Silver
               || weapon.get<ESM::Weapon>()->mBase->mData.mFlags & ESM::Weapon::Magical))
+        {
+            if (weapon.getClass().getEnchantment(weapon).empty()
+              || !Settings::Manager::getBool("enchanted weapons are magical", "Game"))
                 damage *= multiplier;
+        }
 
         if ((weapon.get<ESM::Weapon>()->mBase->mData.mFlags & ESM::Weapon::Silver)
                 && actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())

docs/source/reference/modding/settings/game.rst

@@ -108,6 +108,18 @@ The remaining duration is displayed in the tooltip by hovering over the magical
 
 This setting can only be configured by editing the settings configuration file.
 
+enchanted weapons are magical
+-----------------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+Makes enchanted weapons without Magical flag bypass normal weapons resistance (and weakness) certain creatures have.
+This is how original Morrowind behaves.
+
+This setting can only be configured by editing the settings configuration file.
+
 prevent merchant equipping
 --------------------------
 

files/settings-default.cfg

@@ -182,6 +182,9 @@ show effect duration = false
 # Prevents merchants from equipping items that are sold to them.
 prevent merchant equipping = false
 
+# Make enchanted weaponry without Magical flag bypass normal weapons resistance
+enchanted weapons are magical = true
+
 # Makes player followers and escorters start combat with enemies who have started combat with them
 # or the player. Otherwise they wait for the enemies or the player to do an attack first.
 followers attack on sight = false