Added a stat gain commendation

Author: Shoes01

bin/data/Ruleset/Commendations.rul

@@ -339,6 +339,8 @@ extraStrings:
      STR_MEDAL_ALLRANKS_DESCRIPTION: "Given to a soldier who as killed aliens of all ranks."
      STR_MEDAL_ORIGINAL8_NAME: "First to Serve"
      STR_MEDAL_ORIGINAL8_DESCRIPTION: "Given to a soldier who was first in line to combat the enemy unknown."
+     STR_MEDAL_STATGAIN_NAME: "Improvement Citation"
+     STR_MEDAL_STATGAIN_DESCRIPTION: "Given to a soldier who has dedicated himself or herself to improvement."
      STR_AWARD_0: "First award"
      STR_AWARD_1: "Second award"
      STR_AWARD_2: "Third award"
@@ -509,6 +511,8 @@ extraStrings:
      STR_MEDAL_ALLRANKS_DESCRIPTION: "Given to a soldier who as killed aliens of all ranks."
      STR_MEDAL_ORIGINAL8_NAME: "First to Serve"
      STR_MEDAL_ORIGINAL8_DESCRIPTION: "Given to a soldier who was first in line to combat the enemy unknown."
+     STR_MEDAL_STATGAIN_NAME: "Improvement Citation"
+     STR_MEDAL_STATGAIN_DESCRIPTION: "Given to a soldier who has dedicated himself or herself to improvement."
      STR_AWARD_0: "First award"
      STR_AWARD_1: "Second award"
      STR_AWARD_2: "Third award"
@@ -1355,7 +1359,12 @@ commendations:
     sprite: 00
     criteria:
       totalLongDistanceHits: [999]
-      # Dummy criteria so the game doesn't enter an infinite loop .
+      # Dummy criteria so the game doesn't enter an infinite loop.
+  - type: STR_MEDAL_STATGAIN_NAME
+    description: STR_MEDAL_STATGAIN_DESCRIPTION
+    sprite: 00
+    criteria:
+      totalStatGain: [10, 20, 30, 40, 50, 60, 70, 80, 90, 100]
 ufopaedia:
   - id: STR_MEDAL_MILITARY_CROSS_NAME
     type_id: 7
@@ -1686,6 +1695,13 @@ ufopaedia:
     text: STR_MEDAL_ORIGINAL8_MEDAL_UFOPEDIA
     text_width: 164
     listOrder: 6046
+  - id: STR_MEDAL_STATGAIN_NAME
+    type_id: 7
+    section: STR_HEAVY_WEAPONS_PLATFORMS
+    image_id: PLACEHOLDER #STATGAIN
+    text: STR_MEDAL_STATGAIN_MEDAL_UFOPEDIA
+    text_width: 164
+    listOrder: 6046
 # entries below move the HWPs to the Craft Section of the UFOPedia
   - id: STR_TANK_CANNON
     section: STR_XCOM_CRAFT_ARMAMENT

src/Battlescape/DebriefingState.cpp

@@ -285,6 +285,9 @@ DebriefingState::DebriefingState() : _region(0), _country(0), _noContainment(fal
 				(*j)->getStatistics()->KIA = true;
 			}
 
+			// Set the UnitStats delta
+			(*j)->getStatistics()->delta = *(*j)->getGeoscapeSoldier()->getCurrentStats() - *(*j)->getGeoscapeSoldier()->getInitStats();
+
             (*j)->getGeoscapeSoldier()->getDiary()->updateDiary((*j)->getStatistics(), _missionStatistics, _game->getRuleset());
 			if ((*j)->getStatus() != STATUS_DEAD && (*j)->getGeoscapeSoldier()->getDiary()->manageCommendations(_game->getRuleset()))
 			{

src/Savegame/BattleUnit.h

@@ -184,6 +184,7 @@ struct BattleUnitStatistics
 	bool nikeCross;							// Tracks if a soldier killed every alien
     bool mercyCross;                        // Tracks if a soldier stunned every alien
     int woundsHealed;                       // Tracks how many times a fatal wound was healed by thits unit
+    UnitStats delta;                        // Tracks the increase in unit stats
 
 	/// Functions
 	// Friendly fire check

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), _allUFOs(0), _allMissionTypes(0)
+    _woundsHealedTotal(0), _allUFOs(0), _allMissionTypes(0), _statGainTotal(0)
 {
 }
 /**
@@ -112,6 +112,7 @@ void SoldierDiary::load(const YAML::Node& node)
     _woundsHealedTotal = node["_woundsHealedTotal"].as<int>(_woundsHealedTotal);
 	_allUFOs = node["_allUFOs"].as<int>(_allUFOs);
 	_allMissionTypes = node["_allMissionTypes"].as<int>(_allMissionTypes);
+	_statGainTotal = node["_statGainTotal"].as<int>(_statGainTotal);
 }
 /**
  * Saves the diary to a YAML file.
@@ -163,6 +164,7 @@ YAML::Node SoldierDiary::save() const
     if (_woundsHealedTotal) node["_woundsHealedTotal"] = _woundsHealedTotal;
 	if (_allUFOs) node["_allUFOs"] = _allUFOs;
 	if (_allMissionTypes) node["_allMissionTypes"] = _allMissionTypes;
+	if (_statGainTotal) node["_statGainTotal"] =_statGainTotal;
 	return node;
 }
 /**
@@ -253,6 +255,20 @@ void SoldierDiary::updateDiary(BattleUnitStatistics *unitStatistics, MissionStat
 		_allUFOs = 1;
 	if ((_UFOTotal.size() + _typeTotal.size()) == (rules->getUfosList().size() + rules->getDeploymentsList().size() - 2))
 		_allMissionTypes = 1;
+
+	// Stat change long hand calculation
+	_statGainTotal += unitStatistics->delta.tu;
+	_statGainTotal += unitStatistics->delta.stamina;
+	_statGainTotal += unitStatistics->delta.health;
+	_statGainTotal += unitStatistics->delta.bravery / 10; // Normalize
+	_statGainTotal += unitStatistics->delta.reactions;
+	_statGainTotal += unitStatistics->delta.firing;
+	_statGainTotal += unitStatistics->delta.throwing;
+	_statGainTotal += unitStatistics->delta.strength;
+	_statGainTotal += unitStatistics->delta.psiStrength;
+	_statGainTotal += unitStatistics->delta.melee;
+	_statGainTotal += unitStatistics->delta.psiSkill;
+
     _missionIdList.push_back(missionStatistics->id);
 }
 /**
@@ -334,7 +350,8 @@ bool SoldierDiary::manageCommendations(Ruleset *rules)
                     ((*j).first == "totalAllAliensStunned" && _allAliensStunnedTotal < (*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"])) )
+					((*j).first == "totalAllMissionTypes" && _allMissionTypes < (*j).second.at(nextCommendationLevel["noNoun"])) ||
+					((*j).first == "totalStatGain" && _statGainTotal < (*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, _allUFOs, _allMissionTypes;
+        _woundsHealedTotal, _allUFOs, _allMissionTypes, _statGainTotal;
 	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: