Added two new commendations

Author: Shoes01

bin/data/Ruleset/Commendations.rul

@@ -297,6 +297,10 @@ extraStrings:
      STR_MEDAL_FLANKSHOT_DESCRIPTION: "Given to a soldier who has demonstratd great tactic, able to flank and kill enemies."
      STR_MEDAL_HEALER_NAME: "Hippocratic Star"
      STR_MEDAL_HEALER_DESCRIPTION: "Given to a soldier who has performed medical services in the field."
+     STR_MEDAL_ALLUFOS_NAME: "UFO Recovery Citation"
+     STR_MEDAL_ALLUFOS_DESCRIPTION: "Given to a soldier who has participated in missions involving every UFO type."
+     STR_MEDAL_ALLMISSIONS_NAME: "To Hell and Back Medal"
+     STR_MEDAL_ALLMISSIONS_DESCRIPTION: "Given to a soldier who as participated in every mission type."
      STR_AWARD_0: "First award"
      STR_AWARD_1: "Second award"
      STR_AWARD_2: "Third award"
@@ -445,6 +449,10 @@ extraStrings:
      STR_MEDAL_FLANKSHOT_DESCRIPTION: "Given to a soldier who has demonstratd great tactic, able to flank and kill enemies."
      STR_MEDAL_HEALER_NAME: "Hippocratic Star"
      STR_MEDAL_HEALER_DESCRIPTION: "Given to a soldier who has performed medical services in the field."
+     STR_MEDAL_ALLUFOS_NAME: "UFO Recovery Citation"
+     STR_MEDAL_ALLUFOS_DESCRIPTION: "Given to a soldier who has participated in missions involving every UFO type."
+     STR_MEDAL_ALLMISSIONS_NAME: "To Hell and Back Medal"
+     STR_MEDAL_ALLMISSIONS_DESCRIPTION: "Given to a soldier who as participated in every mission type."
      STR_AWARD_0: "First award"
      STR_AWARD_1: "Second award"
      STR_AWARD_2: "Third award"
@@ -947,9 +955,9 @@ extraStrings:
 #   totalValientCrux
 #   totalTrapKills
 #   isDead
-#   totalHeadShots
-#   totalRearShots
-#   totalFlankShots
+#   totalAllMissionTypes
+#   totalAllUFOs
+#   totalWoundsHealed
 # The following criteria use a hardcoded noun for the name/description.
 # They are INCOMPATIBLE with eachother. If used together,
 # the commendation will be given out repeatedly.
@@ -1211,6 +1219,16 @@ commendations:
     sprite: 32
     criteria:
       totalWoundsHealed: [3, 6, 9, 9, 9, 9, 12, 12, 12, 12]
+  - type: STR_MEDAL_ALLUFOS_NAME
+    description: STR_MEDAL_ALLUFOS_DESCRIPTION
+    sprite: 32
+    criteria:
+      totalAllUFOs: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
+  - type: STR_MEDAL_ALLMISSIONS_NAME
+    description: STR_MEDAL_ALLMISSIONS_DESCRIPTION
+    sprite: 32
+    criteria:
+      totalAllMissionTypes: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
 ufopaedia:
   - id: STR_MEDAL_MILITARY_CROSS_NAME
     type_id: 7
@@ -1478,6 +1496,20 @@ ufopaedia:
     text: STR_MEDAL_HEALER_MEDAL_UFOPEDIA
     text_width: 164
     listOrder: 6033
+  - id: STR_MEDAL_ALLUFOS_NAME
+    type_id: 7
+    section: STR_HEAVY_WEAPONS_PLATFORMS
+    image_id: NIKE_CROSS
+    text: STR_MEDAL_ALLUFOS_MEDAL_UFOPEDIA
+    text_width: 164
+    listOrder: 6033
+  - id: STR_MEDAL_ALLMISSIONS_NAME
+    type_id: 7
+    section: STR_HEAVY_WEAPONS_PLATFORMS
+    image_id: NIKE_CROSS
+    text: STR_MEDAL_ALLMISSIONS_MEDAL_UFOPEDIA
+    text_width: 164
+    listOrder: 6033
 # entries below move the HWPs to the Craft Section of the UFOPedia
   - id: STR_TANK_CANNON
     section: STR_XCOM_CRAFT_ARMAMENT

src/Savegame/SoldierDiary.cpp

@@ -40,7 +40,7 @@ SoldierDiary::SoldierDiary() : _killList(), _regionTotal(), _countryTotal(), _ty
 	_totalShotByFriendlyCounter(0), _totalShotFriendlyCounter(0), _ironManTotal(0), _importantMissionTotal(0), _longDistanceHitCounterTotal(0),
     _lowAccuracyHitCounterTotal(0), _shotsFiredCounterTotal(0), _shotsLandedCounterTotal(0), _shotAtCounter10in1Mission(0), _hitCounter5in1Mission(0),
 	_reactionFireTotal(0), _timesWoundedTotal(0), _valiantCruxTotal(0), _KIA(0), _trapKillTotal(0), _alienBaseAssaultTotal(0), _allAliensKilledTotal(0), _allAliensStunnedTotal(0),
-    _woundsHealedTotal(0)
+    _woundsHealedTotal(0), _allUFOs(0), _allMissionTypes(0)
 {
 }
 /**
@@ -110,6 +110,8 @@ void SoldierDiary::load(const YAML::Node& node)
 	_allAliensKilledTotal = node["allAliensKilledTotal"].as<int>(_allAliensKilledTotal);
     _allAliensStunnedTotal = node["_allAliensStunnedTotal"].as<int>(_allAliensStunnedTotal);
     _woundsHealedTotal = node["_woundsHealedTotal"].as<int>(_woundsHealedTotal);
+	_allUFOs = node["_allUFOs"].as<int>(_allUFOs);
+	_allMissionTypes = node["_allMissionTypes"].as<int>(_allMissionTypes);
 }
 /**
  * Saves the diary to a YAML file.
@@ -159,6 +161,8 @@ YAML::Node SoldierDiary::save() const
 	if (_allAliensKilledTotal) node["allAliensKilledTotal"] = _allAliensKilledTotal;
     if (_allAliensStunnedTotal) node["_allAliensStunnedTotal"] = _allAliensStunnedTotal;
     if (_woundsHealedTotal) node["_woundsHealedTotal"] = _woundsHealedTotal;
+	if (_allUFOs) node["_allUFOs"] = _allUFOs;
+	if (_allMissionTypes) node["_allMissionTypes"] = _allMissionTypes;
 	return node;
 }
 /**
@@ -245,6 +249,10 @@ void SoldierDiary::updateDiary(BattleUnitStatistics *unitStatistics, MissionStat
     if (unitStatistics->nikeCross)
 		_allAliensStunnedTotal++;
 	_woundsHealedTotal = unitStatistics->woundsHealed++;
+	if (_UFOTotal.size() >= rules->getUfosList().size())
+		_allUFOs = 1;
+	if ((_UFOTotal.size() + _typeTotal.size()) == (rules->getUfosList().size() + rules->getDeploymentsList().size() - 2))
+		_allMissionTypes = 1;
     _missionIdList.push_back(missionStatistics->id);
 }
 /**
@@ -324,7 +332,9 @@ bool SoldierDiary::manageCommendations(Ruleset *rules)
 					((*j).first == "totalAlienBaseAssaults" && _alienBaseAssaultTotal < (*j).second.at(nextCommendationLevel["noNoun"])) ||
 					((*j).first == "totalAllAliensKilled" && _allAliensKilledTotal < (*j).second.at(nextCommendationLevel["noNoun"])) || 
                     ((*j).first == "totalAllAliensStunned" && _allAliensStunnedTotal < (*j).second.at(nextCommendationLevel["noNoun"])) ||
-					((*j).first == "totalWoundsHealed" && _woundsHealedTotal < (*j).second.at(nextCommendationLevel["noNoun"])) )
+					((*j).first == "totalWoundsHealed" && _woundsHealedTotal < (*j).second.at(nextCommendationLevel["noNoun"])) ||
+					((*j).first == "totalAllUFOs" && _allUFOs < (*j).second.at(nextCommendationLevel["noNoun"])) ||
+					((*j).first == "totalAllMissionTypes" && _allMissionTypes < (*j).second.at(nextCommendationLevel["noNoun"])) )
 			{
 				awardCommendationBool = false;
 				break;

src/Savegame/SoldierDiary.h

@@ -76,7 +76,7 @@ class SoldierDiary
 		_terrorMissionTotal, _nightMissionTotal, _nightTerrorMissionTotal, _monthsService, _unconciousTotal, _shotAtCounterTotal, _hitCounterTotal, _ironManTotal,
 		_importantMissionTotal, _longDistanceHitCounterTotal, _lowAccuracyHitCounterTotal, _shotsFiredCounterTotal, _shotsLandedCounterTotal, _shotAtCounter10in1Mission,
 		_hitCounter5in1Mission, _reactionFireTotal, _timesWoundedTotal, _valiantCruxTotal, _KIA, _trapKillTotal, _alienBaseAssaultTotal, _allAliensKilledTotal, _allAliensStunnedTotal,
-        _woundsHealedTotal;
+        _woundsHealedTotal, _allUFOs, _allMissionTypes;
 	void manageModularCommendations(std::map<std::string, int> &nextCommendationLevel, std::map<std::string, int> &modularCommendations, std::pair<std::string, int> statTotal, int criteria);
 	void awardCommendation(std::string type, std::string noun = "noNoun");
 public: