Merge remote-tracking branch 'upstream/master' into adlib_fix

Author: myk002

Makefile.am

@@ -664,7 +664,7 @@ openxcom_SOURCES = \
 	src/pch.cpp \
 	src/pch.h \
 	src/resource.h \
-	src/version.h \
+	src/version.h
 
 EXTRA_DIST = \
 	autogen.sh \

bin/standard/XcomUtil_Statstrings/XcomUtil_Statstrings.rul

@@ -1,6 +1,7 @@
 # Based on XcomUtil by Scott Jones and BladeFireLight
 # See http://ufopaedia.org/index.php?title=Statstrings
 # These are the default statStrings from XcomUtil.
+# Melee has been added as a value that can be reported by statstrings.  Use "melee:" as the criteria.
   statStrings:
   - string: "x"
     psiStrength: [~, 30]
@@ -31,4 +32,4 @@
   - string: "R"
     reactions: [60, ~]
   - string: "r"
-    reactions: [50, 59]
+    reactions: [50, 59]

src/Ruleset/StatString.cpp

@@ -43,7 +43,7 @@ StatString::~StatString()
  */
 void StatString::load(const YAML::Node &node)
 {
-    std::string conditionNames[] = {"psiStrength", "psiSkill", "bravery", "strength", "firing", "reactions", "stamina", "tu", "health", "throwing"};
+    std::string conditionNames[] = {"psiStrength", "psiSkill", "bravery", "strength", "firing", "reactions", "stamina", "tu", "health", "throwing", "melee"};
 	_stringToBeAddedIfAllConditionsAreMet = node["string"].as<std::string>(_stringToBeAddedIfAllConditionsAreMet);
     for (size_t i = 0; i < sizeof(conditionNames)/sizeof(conditionNames[0]); i++)
 	{
@@ -160,8 +160,9 @@ std::map<std::string, int> StatString::getCurrentStats(UnitStats &currentStats)
 	currentStatsMap["tu"] = currentStats.tu;
 	currentStatsMap["health"] = currentStats.health;
 	currentStatsMap["throwing"] = currentStats.throwing;
+	currentStatsMap["melee"] = currentStats.melee;
 	return currentStatsMap;
 }
 
 
-}
+}