Made body part and side part of the custom commendation system

Author: Shoes01

bin/data/Ruleset/Commendations.rul

@@ -964,6 +964,8 @@ extraStrings:
 # or one of these factions: FACTION_HOSTILE, FACTION_NEUTRAL, FACTION_PLAYER.
 # or one of these battle types: BT_FIREARM, BT_AMMO, BT_MELEE, BT_GRENADE, BT_PROXIMITYGRENADE, BT_MEDIKIT, BT_SCANNER, BT_MINDPROBE, BT_PSIAMP, BT_FLARE, BT_CORPSE
 # or one of these damage types: DT_AP, DT_IN, DT_HE, DT_LASER, DT_PLASMA, DT_STUN, DT_MELEE, DT_ACID, DT_SMOKE
+# or one of these sides: SIDE_FRONT, SIDE_LEFT, SIDE_RIGHT, SIDE_REAR, SIDE_UNDER
+# or one of these body parts: BODYPART_HEAD, BODYPART_TORSO, BODYPART_RIGHTARM, BODYPART_LEFTARM, BODYPART_RIGHTLEG, BODYPART_LEFTLEG
 # Use the strings from the ruleset to define them (mods can be used too). 
 # For example, look at "STR_MEDAL_BOLTS_CROSS_NAME". It is awarded if a soldier
 # stuns one hostile commander or stuns one hostile leader.
@@ -1182,22 +1184,33 @@ commendations:
     description: STR_MEDAL_HEADSHOT_DESCRIPTION
     sprite: 32
     criteria:
-      totalHeadShots: [3, 6, 9, 9, 9, 9, 12, 12, 12, 12]
+      killsWithCriteriaCareer: [3, 6, 9, 9, 9, 9, 12, 12, 12, 12]
+    killCriteria:
+      -
+        1: ["BODYPART_HEAD", "FACTION_HOSTILE", "STATUS_DEAD"]
   - type: STR_MEDAL_REARSHOT_NAME
     description: STR_MEDAL_REARSHOT_DESCRIPTION
     sprite: 32
     criteria:
-      totalRearShots: [3, 6, 9, 9, 9, 9, 12, 12, 12, 12]
+      killsWithCriteriaCareer: [3, 6, 9, 9, 9, 9, 12, 12, 12, 12]
+    killCriteria:
+      -
+        1: ["SIDE_REAR", "FACTION_HOSTILE", "STATUS_DEAD"]
   - type: STR_MEDAL_FLANKSHOT_NAME
     description: STR_MEDAL_FLANKSHOT_DESCRIPTION
     sprite: 32
     criteria:
-      totalFlankShots: [3, 6, 9, 9, 9, 9, 12, 12, 12, 12]
+      killsWithCriteriaCareer: [3, 6, 9, 9, 9, 9, 12, 12, 12, 12]
+    killCriteria:
+      -
+        1: ["SIDE_LEFT", "FACTION_HOSTILE", "STATUS_DEAD"]
+      -
+        1: ["SIDE_RIGHT", "FACTION_HOSTILE", "STATUS_DEAD"]
   - type: STR_MEDAL_HEALER_NAME
     description: STR_MEDAL_HEALER_DESCRIPTION
     sprite: 32
     criteria:
-      totalWoundsHealed: [3, 6, 9, 9, 9, 9, 12, 12, 12, 12]
+      killsWithCriteriaCareer: [3, 6, 9, 9, 9, 9, 12, 12, 12, 12]
 ufopaedia:
   - id: STR_MEDAL_MILITARY_CROSS_NAME
     type_id: 7

src/Savegame/SoldierDiary.cpp

@@ -39,7 +39,8 @@ SoldierDiary::SoldierDiary() : _killList(), _regionTotal(), _countryTotal(), _ty
 	_nightTerrorMissionTotal(0), _monthsService(0), _unconciousTotal(0), _shotAtCounterTotal(0), _hitCounterTotal(0), _loneSurvivorTotal(0),
 	_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)
+	_reactionFireTotal(0), _timesWoundedTotal(0), _valiantCruxTotal(0), _KIA(0), _trapKillTotal(0), _alienBaseAssaultTotal(0), _allAliensKilledTotal(0), _allAliensStunnedTotal(0),
+    _woundsHealedTotal(0)
 {
 }
 /**
@@ -108,9 +109,6 @@ void SoldierDiary::load(const YAML::Node& node)
 	_alienBaseAssaultTotal = node["alienBaseAssaultTotal"].as<int>(_alienBaseAssaultTotal);
 	_allAliensKilledTotal = node["allAliensKilledTotal"].as<int>(_allAliensKilledTotal);
     _allAliensStunnedTotal = node["_allAliensStunnedTotal"].as<int>(_allAliensStunnedTotal);
-    _headshotTotal = node["_headshotTotal"].as<int>(_headshotTotal);
-    _rearshotTotal = node["_rearshotTotal"].as<int>(_rearshotTotal);
-    _flankshotTotal = node["_flankshotTotal"].as<int>(_flankshotTotal);
     _woundsHealedTotal = node["_woundsHealedTotal"].as<int>(_woundsHealedTotal);
 }
 /**
@@ -160,9 +158,6 @@ YAML::Node SoldierDiary::save() const
 	if (_alienBaseAssaultTotal) node["alienBaseAssaultTotal"] = _alienBaseAssaultTotal;
 	if (_allAliensKilledTotal) node["allAliensKilledTotal"] = _allAliensKilledTotal;
     if (_allAliensStunnedTotal) node["_allAliensStunnedTotal"] = _allAliensStunnedTotal;
-    if (_headshotTotal) node["_headshotTotal"] = _headshotTotal;
-    if (_rearshotTotal) node["_rearshotTotal"] = _rearshotTotal;
-    if (_flankshotTotal) node["_flankshotTotal"] =_flankshotTotal;
     if (_woundsHealedTotal) node["_woundsHealedTotal"] = _woundsHealedTotal;
 	return node;
 }
@@ -183,18 +178,6 @@ void SoldierDiary::updateDiary(BattleUnitStatistics *unitStatistics, MissionStat
             if ((*kill)->getUnitStatusString() == "STATUS_DEAD")
             {
                 _killTotal++;
-                if ((*kill)->getUnitBodyPartString() == "BODYPART_HEAD")
-                {
-                    _headshotTotal++;
-                }
-                if ((*kill)->getUnitSideString() == "SIDE_REAR")
-                {
-                    _rearshotTotal++;
-                }
-				if ((*kill)->getUnitSideString() == "SIDE_LEFT" || (*kill)->getUnitSideString() == "SIDE_RIGHT")
-                {
-                    _flankshotTotal++;
-                }
             }
             else if ((*kill)->getUnitStatusString() == "STATUS_UNCONSCIOUS")
             {
@@ -341,9 +324,6 @@ 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 == "totalHeadShots" && _headshotTotal < (*j).second.at(nextCommendationLevel["noNoun"])) ||
-                    ((*j).first == "totalRearShots" && _rearshotTotal < (*j).second.at(nextCommendationLevel["noNoun"])) ||
-                    ((*j).first == "totalFlankShots" && _flankshotTotal < (*j).second.at(nextCommendationLevel["noNoun"])) ||
 					((*j).first == "totalWoundsHealed" && _woundsHealedTotal < (*j).second.at(nextCommendationLevel["noNoun"])) )
 			{
 				awardCommendationBool = false;
@@ -479,7 +459,8 @@ bool SoldierDiary::manageCommendations(Ruleset *rules)
 									 (*singleKill)->weapon != (*detail) && (*singleKill)->weaponAmmo != (*detail) &&
 									 (*singleKill)->getUnitStatusString() != (*detail) && (*singleKill)->getUnitFactionString() != (*detail)  &&
 									 rules->getItem((*singleKill)->weaponAmmo)->getDamageType() != damageType && 
-									 rules->getItem((*singleKill)->weapon)->getBattleType() != battleType) )
+									 rules->getItem((*singleKill)->weapon)->getBattleType() != battleType &&
+                                     (*singleKill)->getUnitSideString() != (*detail) && (*singleKill)->getUnitBodyPartString() != (*detail)) )
                                 {
                                     foundMatch = 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, _flankshotTotal, _woundsHealedTotal;
+        _woundsHealedTotal;
 	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: