Things appear to be working for the most part

Author: Shoes01

bin/data/Ruleset/Xcom1Ruleset.rul

@@ -9293,14 +9293,9 @@ extraSprites:
 commendations:
   - type: STR_MEDAL_MERIT_STAR_NAME
     description: STR_MEDAL_MERIT_STAR_DESC
-    criteria:
-      total_kills: [1, 2, 3]
-      total_missions: [0, 1, 2]
-    bonus:
-      tu: [0, 1, 2]
+    total_kills: [1, 2, 3]
+    total_missions: [0, 1, 2]
   - type: STR_MILITARY_CROSS_NAME
     description: STR_MILITARY_CROSS_DESC
-    criteria:
-      total_missions: [1, 3, 5]
-    bonus:
-      tu: [1, 1, 1]
+    total_missions: [1, 3, 5]
+

src/Battlescape/DebriefingState.cpp

@@ -236,6 +236,10 @@ DebriefingState::DebriefingState(Game *game) : State(game), _region(0), _country
 		{
 			(*j)->getGeoscapeSoldier()->getDiary()->addSoldierDiaryEntry(_missionTime, _missionRegion, _missionCountry, _missionType, _missionUFO, (*j)->getGeoscapeSoldier()->getTempKills(), _missionSuccess, _missionScore, _missionRating, _missionRace, _missionDaylight, (*j)->getGeoscapeSoldier()->getWoundRecovery());
 			(*j)->getGeoscapeSoldier()->clearTempKills();
+			if ((*j)->getGeoscapeSoldier()->getDiary()->manageCommendations(_game->getRuleset()))
+			{
+				_soldiersCommended.push_back((*j)->getGeoscapeSoldier());
+			}
 		}
 	}
 
@@ -673,11 +677,6 @@ void DebriefingState::prepareDebriefing()
 					if (soldier != 0)
 					{
 						recoverItems((*j)->getInventory(), base);
-
-						if (soldier->getDiary()->manageCommendations(_game->getRuleset()))
-						{
-							_soldiersCommended.push_back(soldier);
-						}
 					}
 					else
 					{ // non soldier player = tank

src/Ruleset/RuleCommendations.cpp

@@ -25,7 +25,7 @@ namespace OpenXcom
 /**
  * Creates a blank set of extra sprite data.
  */
-RuleCommendations::RuleCommendations(const std::string &type) : _type(type), _description(""), _criteria(), _bonus(), _listOrder(0)
+RuleCommendations::RuleCommendations(const std::string &type) : _type(type), _description(""), _total_kills(), _listOrder(0)
 {
 }
 
@@ -44,8 +44,8 @@ void RuleCommendations::load(const YAML::Node &node, int listOrder)
 {
 	_type = node["type"].as<std::string>(_type);
 	_description = node["description"].as<std::string>(_description);
-	_criteria = node["critera"].as<std::map<std::string, std::vector<int> > >(_criteria);
-	_bonus = node["bonus"].as<std::map<std::string, std::vector<int> > >(_bonus);
+	_total_kills = node["total_kills"].as<std::vector<int> >(_total_kills);
+	_total_missions = node["total_missions"].as<std::vector<int> >(_total_missions);
 	_listOrder = node["listOrder"].as<int>(_listOrder);
 	if (!_listOrder)
 	{
@@ -84,10 +84,14 @@ std::string RuleCommendations::getDescription() const
  * Get commendation award criteria
  * @return map<string, int> Commendation criteria
  */
-std::map<std::string, std::vector<int> > RuleCommendations::getCriteria() const
+std::vector<int> RuleCommendations::getTotalKills() const
 {
-	return _criteria;
+	return _total_kills;
 }
 
+std::vector<int> RuleCommendations::getTotalMissions() const
+{
+	return _total_missions;
+}
 
 }

src/Ruleset/RuleCommendations.h

@@ -31,8 +31,7 @@ class RuleCommendations
 {
 private:
 	std::string _type, _description;
-	std::map<std::string, std::vector<int> > _criteria;
-	std::map<std::string, std::vector<int> > _bonus;
+	std::vector<int> _total_kills, _total_missions;
 	int _listOrder;
 public:
 	/// Creates a blank commendation ruleset.
@@ -47,8 +46,9 @@ class RuleCommendations
 	std::string getName() const;
 	/// Get commendation description
 	std::string getDescription() const;
-	/// Get commendation award criteria
-	std::map<std::string, std::vector<int> > getCriteria() const;
+	/// Get commendation award criteria for kills
+	std::vector<int> getTotalKills() const;
+	std::vector<int> getTotalMissions() const;
 };
 
 }

src/Savegame/SoldierDiary.cpp

@@ -316,44 +316,47 @@ std::vector<SoldierCommendations*> *SoldierDiary::getSoldierCommendations()
 bool SoldierDiary::manageCommendations(Ruleset *rules)
 {
 	std::vector<std::string> _commendationsList = rules->getCommendationList();
-	bool awardedCommendation = true;
+	bool awardedCommendation = false;
 	int _decorationLevel = 0;
-	std::string _criteriaType;
-	int _criteriaThreshold;
+	std::vector<int> _total_kills, _total_missions;
 
 	// Loop over all commendations
 	for (std::vector<std::string>::const_iterator i = _commendationsList.begin(); i != _commendationsList.end(); ++i)
 	{	
+		_total_kills.clear();
+		_total_missions.clear();
+
 		// Each commendation has its own list of criteria
-		std::map<std::string, std::vector<int> > _commendationCriteria = rules->getCommendation(*i)->getCriteria();
+		if (!rules->getCommendation(*i)->getTotalKills().empty())
+			_total_kills = rules->getCommendation(*i)->getTotalKills();
+		if (!rules->getCommendation(*i)->getTotalMissions().empty())
+			_total_missions = rules->getCommendation(*i)->getTotalMissions();
 
 		// See if we already have the commendation, and if so what level it is
 		for (std::vector<SoldierCommendations*>::const_iterator j = _commendations.begin(); j != _commendations.end(); ++j)
 		{
 			// Do we already have the commendation?
 			if ( (*i) == (*j)->getCommendationName() )
 			{
-				_decorationLevel = (*j)->getDecorationLevelInt();
-				break;
-			}
-		}
-		
-		// Loop over criteria
-		for(std::map<std::string, std::vector<int> >::const_iterator j = _commendationCriteria.begin(); j != _commendationCriteria.end(); ++j)
-		{
-			// If we don't have ANY of the following, that means we won't be awarded the commendation
-			if ( !((*j).first == "total_kills" && getKillTotal() >= (*j).second[_decorationLevel] ||
-				   (*j).first == "total_missions" && getMissionTotal() >= (*j).second[_decorationLevel]) )
-			{
-				awardedCommendation = false;
+				_decorationLevel = (*j)->getDecorationLevelInt() + 1;
 				break;
 			}
 		}
 
-		if (awardedCommendation)
+		// Go through each possible criteria
+		// If there is a criteria (not empty) AND the soldier does not match it, then he does not get the medal, full stop.
+		if ( !_total_kills.empty() && _total_kills.size() != _decorationLevel && getKillTotal() < _total_kills[_decorationLevel] )
 		{
-			awardCommendation(*i);
+			continue;
+		} 
+		else if ( !_total_missions.empty() && _total_missions.size() != _decorationLevel && getMissionTotal() < _total_missions[_decorationLevel] )
+		{
+			continue;
 		}
+
+		// If the code has made it this far, this soldier deserves a medal!
+		awardCommendation(*i);
+		awardedCommendation = true;
 	}
 
 	return awardedCommendation;