Added logic for kills by criteria

Author: Shoes01

bin/data/Ruleset/Commendations.rul

@@ -293,4 +293,40 @@ commendations:
     description: STR_MEDAL_HELLRAISER_MEDAL_DESCRIPTION
     sprite: 11
     criteria:
-      total_fell_unconcious: [1, 2, 3, 4, 5, 7, 9, 11, 15, 20]
+      total_fell_unconcious: [1, 2, 3, 4, 5, 7, 9, 11, 15, 20]
+  - type: STR_MEDAL_NAME
+    description: STR_MEDAL_DESCRIPTION
+    sprite: 0
+    criteria:
+      kills_with_criteria: [1, 2, 3, 4, 5, 7, 9, 11, 15, 20]
+    killCriteria:
+      - ["Sectoid", "Commander"]
+    # Awarded when soldier kills one Sectoid + Commander
+  - type: STR_MEDAL_NAME
+    description: STR_MEDAL_DESCRIPTION
+    sprite: 0
+    criteria:
+      kills_with_criteria: [1, 2, 3, 4, 5, 7, 9, 11, 15, 20]
+    killCriteria:
+      - ["Sectoid"]
+      - ["Floater"]
+      - ["Snakeman"]
+    # Awarded when soldier kills one Sectoid, one Floater, one Snakeman
+  - type: STR_MEDAL_NAME
+    description: STR_MEDAL_DESCRIPTION
+    sprite: 0
+    criteria:
+      kills_with_criteria: [1, 2, 3, 4, 5, 7, 9, 11, 15, 20]
+    killCriteria:
+      - ["Sectoid", "Soldier"]
+      - ["Floater", "Soldier"]
+      - ["Snakeman", "Soldier"]
+    # Awarded when soldier kills one Sectoid + Soldier, one Floater + Soldier, one Snakeman + Soldier
+  - type: STR_MEDAL_NAME
+    description: STR_MEDAL_DESCRIPTION
+    sprite: 0
+    criteria:
+      kills_with_criteria: [1, 2, 3, 4, 5, 7, 9, 11, 15, 20]
+    killCriteria:
+      - ["Sectoid", "Incendiary Rocket"]
+    # Awarded when a soldier kills one Sectoid using Incendiary Rockets

src/Ruleset/RuleCommendations.cpp

@@ -44,6 +44,7 @@ void RuleCommendations::load(const YAML::Node &node, int listOrder)
 {
 	_description = node["description"].as<std::string>(_description);
 	_criteria = node["criteria"].as< std::map< std::string, std::vector<int> > >(_criteria);
+	_killCriteria = node["killCriteria"].as< std::vector< std::vector<std::string> > >(_killCriteria);
     _sprite = node["sprite"].as<int>(_sprite);
 	_listOrder = node["listOrder"].as<int>(_listOrder);
 	if (!_listOrder)
@@ -79,6 +80,15 @@ std::map<std::string, std::vector<int> > *RuleCommendations::getCriteria()
 	return &_criteria;
 }
 
+/**
+ * Get commendation award kill criteria
+ * @return vecotr<string> Commendation kill criteria
+ */
+std::vector< std::vector<std::string> > *RuleCommendations::getKillCriteria()
+{
+	return &_killCriteria;
+}
+
 /**
  * Get the commendation's sprite
  * @return int Sprite number

src/Ruleset/RuleCommendations.h

@@ -31,6 +31,7 @@ class RuleCommendations
 {
 private:
 	std::map<std::string, std::vector<int> > _criteria;
+	std::vector< std::vector<std::string> > _killCriteria;
 	std::string _description;
 	int _listOrder;
 	int _sprite;
@@ -49,6 +50,8 @@ class RuleCommendations
 	std::string getDescription() const;
 	/// Get commendation award criteria
 	std::map<std::string, std::vector<int> > *getCriteria();
+	/// Get commendation award kill related criteria
+	std::vector< std::vector<std::string> > *getKillCriteria();
 	/// Get sprite
 	int getSprite() const;
 

src/Savegame/SoldierDiary.cpp

@@ -150,6 +150,7 @@ void SoldierDiary::updateDiary()
 	SoldierDiaryEntries *latestEntry = _diaryEntries.back();
 	for (std::vector<SoldierDiaryKills*>::const_iterator j = latestEntry->getMissionStatistics()->kills.begin() ; j != latestEntry->getMissionStatistics()->kills.end() ; ++j)
     {
+		_killList.push_back(*j);
         _alienRankTotal[(*j)->getAlienRank().c_str()]++;
         _alienRaceTotal[(*j)->getAlienRace().c_str()]++;
         _weaponTotal[(*j)->getWeapon().c_str()]++;
@@ -468,6 +469,47 @@ bool SoldierDiary::manageCommendations(Ruleset *rules)
 					break;
 				}
 			}
+			else if ((*j).first == "kills_with_criteria")
+			{
+				std::vector<std::vector<std::string> > *_killCriteriaList = (*i).second->getKillCriteria();
+                
+                /// Add "original faction" to the SoldierDiaryKills class so we can track enemy kills
+                /// Look to see if it's possible to convert the enum AlienState to a string when comparing OR convert the string from the ruleset to an enum AlienState
+                
+                // Loop over the vector of vectors of items
+                for (std::vector<std::vector<std::string> >::const_iterator listItem = _killCriteriaList->begin(); listItem != _killCriteriaList->end(); ++listItem)
+                {
+                    int count = 0; // Reset count
+                    std::vector<SoldierDiaryKills*> _tmpKillList = _killList; // Reset kills
+                    // Loop over the vector of kills
+                    for (std::vector<SoldierDiaryKills*>::const_iterator singleKill = _tmpKillList.begin(); singleKill != _tmpKillList.end(); ++singleKill)
+                    {
+                        bool foundMatch = true; // Reset bool
+                        // Loop over the vector of items
+                        for (std::vector<std::string>::const_iterator item = listItem->begin(); item != listItem->end(); ++item)
+                        {
+                            // See if we find no matches with any criteria. If so, break and try the next kill.
+                            if ((*singleKill)->getAlienRank() != (*item) && (*singleKill)->getAlienRace() != (*item) && (*singleKill)->getWeapon() != (*item) && (*singleKill)->getWeaponAmmo() != (*item))
+                            {
+                                // Remove entries that have no matches.
+                                _tmpKillList.erase(singleKill); // I assume this deletes the current kill from the vector... hopefully.
+                                foundMatch = false;
+                                break;
+                            }
+                        }
+                        if (foundMatch) count++;
+                    }
+                    // If this single vector of items doesn't make the cut, do not award commendation
+                    if (count < (*j).second.at(_nextCommendationLevel[""])) 
+                    {
+                        _awardCommendation = false;
+                        break;
+                    }
+                }
+                // Break out of this for loop as well
+                if (!_awardCommendation) break;
+				
+			}
 		}
 		if (_awardCommendation)
 		{

src/Savegame/SoldierDiary.h

@@ -192,6 +192,7 @@ class SoldierDiary
 	std::vector<SoldierDiaryEntries*> _diaryEntries;
 	std::vector<SoldierCommendations*> _commendations;
 	RuleCommendations *_rules;
+	std::vector<SoldierDiaryKills*> _killList;
 	std::map<std::string, int> _alienRankTotal, _alienRaceTotal, _weaponTotal, _weaponAmmoTotal, _regionTotal, _countryTotal, _typeTotal, _UFOTotal;
 	int _scoreTotal, _killTotal, _missionTotal, _winTotal, _stunTotal, _daysWoundedTotal, _baseDefenseMissionTotal,
 		_terrorMissionTotal, _nightMissionTotal, _nightTerrorMissionTotal, _monthsService, _unconciousTotal, _killsWithFireTotal;