Added flank shot commendation

Author: Shoes01

bin/data/Ruleset/Commendations.rul

@@ -293,6 +293,8 @@ extraStrings:
      STR_MEDAL_HEADSHOT_DESCRIPTION: "Given to a soldier with a steady hand who has landed multiple headshots."
      STR_MEDAL_REARSHOT_NAME: "Cunning Citation"
      STR_MEDAL_REARSHOT_DESCRIPTION: "Given to a soldier who has demonstrated cunning, able to surprise enemies and kill them from behind."
+     STR_MEDAL_FLANKSHOT_NAME: "Tactition Citation"
+     STR_MEDAL_FLANKSHOT_DESCRIPTION: "Given to a soldier who has demonstratd great tactic, able to flank and kill enemies."
      STR_AWARD_0: "First award"
      STR_AWARD_1: "Second award"
      STR_AWARD_2: "Third award"
@@ -437,6 +439,8 @@ extraStrings:
      STR_MEDAL_HEADSHOT_DESCRIPTION: "Given to a soldier with a steady hand who has landed multiple headshots."
      STR_MEDAL_REARSHOT_NAME: "Cunning Citation"
      STR_MEDAL_REARSHOT_DESCRIPTION: "Given to a soldier who has demonstrated cunning, able to surprise enemies and kill them from behind."
+     STR_MEDAL_FLANKSHOT_NAME: "Tactition Citation"
+     STR_MEDAL_FLANKSHOT_DESCRIPTION: "Given to a soldier who has demonstratd great tactic, able to flank and kill enemies."
      STR_AWARD_0: "First award"
      STR_AWARD_1: "Second award"
      STR_AWARD_2: "Third award"
@@ -941,6 +945,7 @@ extraStrings:
 #   isDead
 #   totalHeadShots
 #   totalRearShots
+#   totalFlankShots
 # 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.
@@ -1178,7 +1183,12 @@ commendations:
     description: STR_MEDAL_REARSHOT_DESCRIPTION
     sprite: 32
     criteria:
-      totalRearShots: [3, 6, 9, 9, 9, 9, 12, 12, 12, 12]      
+      totalRearShots: [3, 6, 9, 9, 9, 9, 12, 12, 12, 12]
+  - type: STR_MEDAL_FLANKSHOT_NAME
+    description: STR_MEDAL_FLANKSHOT_DESCRIPTION
+    sprite: 32
+    criteria:
+      totalFlankShots: [3, 6, 9, 9, 9, 9, 12, 12, 12, 12]
 ufopaedia:
   - id: STR_MEDAL_MILITARY_CROSS_NAME
     type_id: 7
@@ -1431,7 +1441,14 @@ ufopaedia:
     image_id: NIKE_CROSS
     text: STR_MEDAL_REARSHOT_MEDAL_UFOPEDIA
     text_width: 164
-    listOrder: 6033    
+    listOrder: 6033
+  - id: STR_MEDAL_FLANKSHOT_NAME
+    type_id: 7
+    section: STR_HEAVY_WEAPONS_PLATFORMS
+    image_id: NIKE_CROSS
+    text: STR_MEDAL_FLANKSHOT_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

@@ -110,6 +110,7 @@ void SoldierDiary::load(const YAML::Node& node)
     _allAliensStunnedTotal = node["_allAliensStunnedTotal"].as<int>(_allAliensStunnedTotal);
     _headshotTotal = node["_headshotTotal"].as<int>(_headshotTotal);
     _rearshotTotal = node["_rearshotTotal"].as<int>(_rearshotTotal);
+    _flankshotTotal = node["_flankshotTotal"].as<int>(_flankshotTotal);
 }
 /**
  * Saves the diary to a YAML file.
@@ -160,6 +161,7 @@ YAML::Node SoldierDiary::save() const
     if (_allAliensStunnedTotal) node["_allAliensStunnedTotal"] = _allAliensStunnedTotal;
     if (_headshotTotal) node["_headshotTotal"] = _headshotTotal;
     if (_rearshotTotal) node["_rearshotTotal"] = _rearshotTotal;
+    if (_flankshotTotal) node["_flankshotTotal"] =_flankshotTotal;
 	return node;
 }
 /**
@@ -186,6 +188,10 @@ void SoldierDiary::updateDiary(BattleUnitStatistics *unitStatistics, MissionStat
                 if ((*kill)->getUnitSideString() == "SIDE_REAR")
                 {
                     _rearshotTotal++;
+                }
+				if ((*kill)->getUnitSideString() == "SIDE_LEFT" || (*kill)->getUnitSideString() == "SIDE_RIGHT")
+                {
+                    _flankshotTotal++;
                 }
             }
             else if ((*kill)->getUnitStatusString() == "STATUS_UNCONSCIOUS")
@@ -333,7 +339,8 @@ bool SoldierDiary::manageCommendations(Ruleset *rules)
 					((*j).first == "totalAllAliensKilled" && _allAliensKilledTotal < (*j).second.at(nextCommendationLevel["noNoun"])) || 
                     ((*j).first == "totalAllAliensStunned" && _allAliensStunnedTotal < (*j).second.at(nextCommendationLevel["noNoun"])) ||
                     ((*j).first == "totalHeadShots" && _headshotTotal < (*j).second.at(nextCommendationLevel["noNoun"])) ||
-                    ((*j).first == "totalRearShots" && _rearshotTotal < (*j).second.at(nextCommendationLevel["noNoun"])) )
+                    ((*j).first == "totalRearShots" && _rearshotTotal < (*j).second.at(nextCommendationLevel["noNoun"])) ||
+                    ((*j).first == "totalFlankShots" && _flankshotTotal < (*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,
-        _headshotTotal, _rearshotTotal;
+        _headshotTotal, _rearshotTotal, _flankshotTotal;
 	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: