From 506cc47c9d9db2a39c9eb2724b48f273d24a3691 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 18 Mar 2017 19:23:19 +0400
Subject: [PATCH] Add option to show reach and attack speed for melee weapons

---
 apps/openmw/mwclass/weapon.cpp | 8 ++++++++
 apps/openmw/mwgui/tooltips.cpp | 8 ++++++++
 apps/openmw/mwgui/tooltips.hpp | 1 +
 files/settings-default.cfg     | 3 +++
 4 files changed, 20 insertions(+)

diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 952464eec..575accaba 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -321,6 +321,14 @@ namespace MWClass
                     + MWGui::ToolTips::toString(ref->mBase->mData.mHealth);
         }
 
+        // add reach and attack speed for melee weapon
+        if (ref->mBase->mData.mType < 9 && Settings::Manager::getBool("show melee info", "Game"))
+        {
+            text += MWGui::ToolTips::getPercentString(ref->mBase->mData.mReach, "#{sRange}");
+
+            text += MWGui::ToolTips::getPercentString(ref->mBase->mData.mSpeed, "#{sAttributeSpeed}");
+        }
+
         text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
         text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index b3cc19a64..e25981a62 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -594,6 +594,14 @@ namespace MWGui
             return "\n" + prefix + ": " + toString(weight);
     }
 
+    std::string ToolTips::getPercentString(const float value, const std::string& prefix)
+    {
+        if (value == 0)
+            return "";
+        else
+            return "\n" + prefix + ": " + toString(value*100) +"%";
+    }
+
     std::string ToolTips::getValueString(const int value, const std::string& prefix)
     {
         if (value == 0)
diff --git a/apps/openmw/mwgui/tooltips.hpp b/apps/openmw/mwgui/tooltips.hpp
index de5b89b7f..2db5fce34 100644
--- a/apps/openmw/mwgui/tooltips.hpp
+++ b/apps/openmw/mwgui/tooltips.hpp
@@ -63,6 +63,7 @@ namespace MWGui
         ///< set the screen-space position of the tooltip for focused object
 
         static std::string getWeightString(const float weight, const std::string& prefix);
+        static std::string getPercentString(const float value, const std::string& prefix);
         static std::string getValueString(const int value, const std::string& prefix);
         ///< @return "prefix: value" or "" if value is 0
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 472e9c596..da0cbd285 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -149,6 +149,9 @@ show owned = 0
 # Show damage bonus of arrow and bolts.
 show projectile damage = false
 
+# Show additional melee weapon info: reach and attack speed
+show melee info = false
+
 # Always use the best mode of attack: e.g. chop, slash or thrust.
 best attack = false