Made the werewolf check optional

apps/launcher/advancedpage.cpp

@@ -77,6 +77,9 @@ bool Launcher::AdvancedPage::loadSettings()
     loadSettingBool(enchantedWeaponsMagicalCheckBox, "enchanted weapons are magical", "Game");
     loadSettingBool(permanentBarterDispositionChangeCheckBox, "barter disposition change is permanent", "Game");
     loadSettingBool(strengthInfluencesHandToHand, "strength influences hand to hand", "Game");
+    int unarmedFactorsStrengthIndex = mEngineSettings.getInt("strength influences hand to hand", "Game");
+    if (unarmedFactorsStrengthIndex >= 0 && unarmedFactorsStrengthIndex <= 2)
+        unarmedFactorsStrengthComboBox->setCurrentIndex(unarmedFactorsStrengthIndex);
 
     // Input Settings
     loadSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input");
@@ -133,6 +136,9 @@ void Launcher::AdvancedPage::saveSettings()
     saveSettingBool(enchantedWeaponsMagicalCheckBox, "enchanted weapons are magical", "Game");
     saveSettingBool(permanentBarterDispositionChangeCheckBox, "barter disposition change is permanent", "Game");
     saveSettingBool(strengthInfluencesHandToHand, "strength influences hand to hand", "Game");
+    int unarmedFactorsStrengthIndex = unarmedFactorsStrengthComboBox->currentIndex();
+    if (unarmedFactorsStrengthIndex != mEngineSettings.getInt("strength influences hand to hand", "Game"))
+        mEngineSettings.setInt("strength influences hand to hand", "Game", unarmedFactorsStrengthIndex);
 
     // Input Settings
     saveSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input");

apps/openmw/mwmechanics/combat.cpp

@@ -399,7 +399,12 @@ namespace MWMechanics
                 || otherstats.getKnockedDown();
         bool isWerewolf = (attacker.getClass().isNpc() && attacker.getClass().getNpcStats(attacker).isWerewolf());
 
-        if (Settings::Manager::getBool("strength influences hand to hand", "Game") && !isWerewolf) {
+        // Options in the launcher's combo box: unarmedFactorsStrengthComboBox
+        // 0 = Do not factor strength into hand-to-hand combat.
+        // 1 = Factor into werewolf hand-to-hand combat.
+        // 2 = Ignore werewolves.
+        int factorStrength = Settings::Manager::getInt("strength influences hand to hand", "Game");
+        if (factorStrength == 1 || (factorStrength == 2 && !isWerewolf)) {
             damage *= attacker.getClass().getCreatureStats(attacker).getAttribute(ESM::Attribute::Strength).getModified() / 40.0f;
         }
 

files/settings-default.cfg

@@ -225,8 +225,10 @@ use additional anim sources = false
 # Make the disposition change of merchants caused by barter dealings permanent
 barter disposition change is permanent = false
 
-# Factors Strength into hand-to-hand combat. Uses the MCP formula (damage * (strength / 40)).
+# Uses the MCP formula (damage * (strength / 40)) to factor Strength into hand-to-hand combat.
-strength influences hand to hand = false
+# (0 means it does not factor it in, 1 means it factors into werewolves damage calculation and
+# 2 means werewolves are ignored) 
+strength influences hand to hand = 0
 
 [General]
 

files/ui/advancedpage.ui

@@ -100,14 +100,59 @@
             <property name="text">
              <string>Barter disposition change is permanent</string>
            <widget class="QCheckBox" name="strengthInfluencesHandToHand">
+          <item alignment="Qt::AlignLeft">
+           <widget class="QWidget" name="unarmedFactorsStrengthGroup" native="true">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Uses the MCP formula (damage * (strength / 40)) to factor the Strength attribute into hand-to-hand combat.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Factor strength into hand-to-hand damage calculations, as the MCP formula: damage * (strength / 40).&lt;/p&gt;&lt;p&gt;The default value is Off.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
+            <layout class="QHBoxLayout" name="horizontalUnarmedStrengthLayout">
+             <property name="spacing">
+              <number>-1</number>
+             </property>
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item alignment="Qt::AlignRight">
+              <widget class="QLabel" name="unarmedFactorsStrengthLabel">
                <property name="text">
-             <string>Factor strength into hand-to-hand combat</string>
+                <string>Factor strength into hand-to-hand combat:</string>
                </property>
               </widget>
              </item>
+             <item>
+              <widget class="QComboBox" name="unarmedFactorsStrengthComboBox">
+               <property name="currentIndex">
+                <number>1</number>
+               </property>
+               <item>
+                <property name="text">
+                 <string>Off</string>
+                </property>
+               </item>
+               <item>
+                <property name="text">
+                 <string>Affect werewolves</string>
+                </property>
+               </item>
+               <item>
+                <property name="text">
+                 <string>Do not affect werewolves</string>
+                </property>
+               </item>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>