Added Mercy Cross

Author: Shoes01

bin/data/Ruleset/Commendations.rul

@@ -287,6 +287,8 @@ extraStrings:
      STR_MEDAL_ALIEN_BASE_ASSAULT_DESCRIPTION: "Given to a soldier who has been part of a successful alien base assault mission."
      STR_MEDAL_NIKE_CROSS_NAME: "Nike Cross"
      STR_MEDAL_NIKE_CROSS_DESCRIPTION: "Given to a soldier who single handedly killed every alien in a mission."
+     STR_MEDAL_MERCY_CROSS_NAME: "Mercy Cross"
+     STR_MEDAL_MERCY_CROSS_DESCRIPTION: "Given to a soldier who single handedly stunned every alien in a mission."
      STR_AWARD_0: "First award"
      STR_AWARD_1: "Second award"
      STR_AWARD_2: "Third award"
@@ -425,6 +427,8 @@ extraStrings:
      STR_MEDAL_ALIEN_BASE_ASSAULT_DESCRIPTION: "Given to a soldier who has been part of a successful alien base assault mission."
      STR_MEDAL_NIKE_CROSS_NAME: "Nike Cross"
      STR_MEDAL_NIKE_CROSS_DESCRIPTION: "Given to a soldier who single handedly killed every alien in a mission."
+     STR_MEDAL_MERCY_CROSS_NAME: "Nike Cross"
+     STR_MEDAL_MERCY_CROSS_DESCRIPTION: "Given to a soldier who single handedly killed every alien in a mission."
      STR_AWARD_0: "First award"
      STR_AWARD_1: "Second award"
      STR_AWARD_2: "Third award"
@@ -694,6 +698,8 @@ extraStrings:
      STR_MEDAL_ALIEN_BASE_ASSAULT_DESCRIPTION: "Вручается солдату, за участие в операции по уничтожению базы пришельцев."
      STR_MEDAL_NIKE_CROSS_NAME: "Крест Победы"
      STR_MEDAL_NIKE_CROSS_DESCRIPTION: "Вручается солдату, единолично уничтожившему силы пришельцев в ходе операции."
+     STR_MEDAL_MERCY_CROSS_NAME: "Крест Победы"
+     STR_MEDAL_MERCY_CROSS_DESCRIPTION: "Вручается солдату, единолично уничтожившему силы пришельцев в ходе операции."
      STR_AWARD_0: "Первая награда"
      STR_AWARD_1: "Вторая награда"
      STR_AWARD_2: "Третья награда"
@@ -841,6 +847,8 @@ extraStrings:
       STR_MEDAL_NAME: Nome della Medaglia
       STR_MEDAL_NIKE_CROSS_DESCRIPTION: Data ad un soldato che ha ucciso da solo tutti gli alieni durante una missione.
       STR_MEDAL_NIKE_CROSS_NAME: Croce di Nike
+      STR_MEDAL_MERCY_CROSS_DESCRIPTION: Data ad un soldato che ha ucciso da solo tutti gli alieni durante una missione.
+      STR_MEDAL_MERCY_CROSS_NAME: Croce di Nike
       STR_MEDAL_ORDER_OF_EARTH_DESCRIPTION: Data ad un soldato che è stato importante nella difesa della Terra
       STR_MEDAL_ORDER_OF_EARTH_NAME: "L'Ordine della Terra"
       STR_MEDAL_ORDER_OF_GLORY_DESCRIPTION: Data ad un soldato che è stato importante nella riuscita di una missione.
@@ -1146,6 +1154,11 @@ commendations:
     sprite: 32
     criteria:
       totalAllAliensKilled: [1, 1, 2, 2, 2, 2, 3, 3, 3, 3]
+  - type: STR_MEDAL_MERCY_CROSS_NAME
+    description: STR_MEDAL_MERCY_CROSS_DESCRIPTION
+    sprite: 32
+    criteria:
+      totalAllAliensStunned: [1, 1, 2, 2, 2, 2, 3, 3, 3, 3]
 ufopaedia:
   - id: STR_MEDAL_MILITARY_CROSS_NAME
     type_id: 7
@@ -1377,6 +1390,13 @@ ufopaedia:
     image_id: NIKE_CROSS
     text: STR_MEDAL_NIKE_CROSS_MEDAL_UFOPEDIA
     text_width: 164
+    listOrder: 6033
+  - id: STR_MEDAL_MERCY_CROSS_NAME
+    type_id: 7
+    section: STR_HEAVY_WEAPONS_PLATFORMS
+    image_id: NIKE_CROSS
+    text: STR_MEDAL_MERCY_CROSS_MEDAL_UFOPEDIA
+    text_width: 164
     listOrder: 6033  
 # entries below move the HWPs to the Craft Section of the UFOPedia
   - id: STR_TANK_CANNON

src/Battlescape/DebriefingState.cpp

@@ -149,7 +149,7 @@ DebriefingState::DebriefingState() : _region(0), _country(0), _noContainment(fal
 
 	int total = 0, statsY = 0, recoveryY = 0;
 	int civiliansSaved = 0, civiliansDead = 0;
-    int aliensKilled = 0;
+    int aliensKilled = 0, aliensStunned = 0;
 	for (std::vector<DebriefingStat*>::iterator i = _stats.begin(); i != _stats.end(); ++i)
 	{
 		if ((*i)->qty == 0)
@@ -181,6 +181,10 @@ DebriefingState::DebriefingState() : _region(0), _country(0), _noContainment(fal
         {
             aliensKilled += (*i)->qty;
         }
+        if ((*i)->item == "STR_LIVE_ALIENS_RECOVERED")
+        {
+            aliensStunned += (*i)->qty;
+        }
 	}
 	if (civiliansSaved && !civiliansDead && _missionStatistics->success == true)
 	{
@@ -254,17 +258,26 @@ DebriefingState::DebriefingState() : _region(0), _country(0), _noContainment(fal
 		if ((*j)->getGeoscapeSoldier())
 		{
 			int soldierAlienKills = 0;
+			int soldierAlienStuns = 0;
 			for (std::vector<BattleUnitKills*>::const_iterator k = (*j)->getStatistics()->kills.begin(); k != (*j)->getStatistics()->kills.end(); ++k)
 			{
 				if ((*k)->faction == FACTION_HOSTILE && (*k)->getUnitStatusString() == "STATUS_DEAD")
 				{
 					soldierAlienKills++;
 				}
+				if ((*k)->faction == FACTION_HOSTILE && (*k)->getUnitStatusString() == "STATUS_UNCONSCIOUS")
+				{
+					soldierAlienStuns++;
+				}
 			}
 			if (aliensKilled && aliensKilled == soldierAlienKills && _missionStatistics->success == true)
 			{
 				(*j)->getStatistics()->nikeCross = true;
 			}
+			if (aliensStunned && aliensStunned == soldierAlienStuns && _missionStatistics->success == true)
+			{
+				(*j)->getStatistics()->mercyCross = true;
+			}
 			(*j)->getStatistics()->daysWounded = (*j)->getGeoscapeSoldier()->getWoundRecovery();
 			_missionStatistics->injuryList[(*j)->getGeoscapeSoldier()->getId()] = (*j)->getGeoscapeSoldier()->getWoundRecovery();
 			if ((*j)->getStatus() == STATUS_DEAD)

src/Savegame/BattleUnit.h

@@ -149,6 +149,7 @@ struct BattleUnitStatistics
     int daysWounded;                        // Tracks how many days the unit was wounded for
 	bool KIA;								// Tracks if the soldier was killed in battle
 	bool nikeCross;							// Tracks if a soldier killed every alien
+    bool mercyCross;                        // Tracks if a soldier stunned every alien
 
 	/// Functions
 	// Friendly fire check
@@ -181,6 +182,7 @@ struct BattleUnitStatistics
 		shotsFiredCounter = node["shotsFiredCounter"].as<int>(shotsFiredCounter);
 		shotsLandedCounter = node["shotsLandedCounter"].as<int>(shotsLandedCounter);
 		nikeCross = node["nikeCross"].as<bool>(nikeCross);
+        mercyCross = node["mercyCross"].as<bool>(mercyCross);
 	}
 	// Save function
 	YAML::Node save() const
@@ -203,10 +205,11 @@ struct BattleUnitStatistics
 		node["shotsFiredCounter"] = shotsFiredCounter;
 		node["shotsLandedCounter"] = shotsLandedCounter;
 		if (nikeCross) node["nikeCross"] = nikeCross;
+        if (mercyCross) node["mercyCross"] = mercyCross;
 		return node;
 	}
 	BattleUnitStatistics(const YAML::Node& node) { load(node); }
-	BattleUnitStatistics() : wasUnconcious(false), kills(), shotAtCounter(0), hitCounter(0), shotByFriendlyCounter(0), shotFriendlyCounter(0), loneSurvivor(false), ironMan(false), longDistanceHitCounter(0), lowAccuracyHitCounter(0), shotsFiredCounter(0), shotsLandedCounter(0), KIA(false), nikeCross(false) { }
+	BattleUnitStatistics() : wasUnconcious(false), kills(), shotAtCounter(0), hitCounter(0), shotByFriendlyCounter(0), shotFriendlyCounter(0), loneSurvivor(false), ironMan(false), longDistanceHitCounter(0), lowAccuracyHitCounter(0), shotsFiredCounter(0), shotsLandedCounter(0), KIA(false), nikeCross(false), mercyCross(false) { }
 	~BattleUnitStatistics() { }
 };
 

src/Savegame/SoldierDiary.cpp

@@ -39,7 +39,7 @@ 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)
+	_reactionFireTotal(0), _timesWoundedTotal(0), _valiantCruxTotal(0), _KIA(0), _trapKillTotal(0), _alienBaseAssaultTotal(0), _allAliensKilledTotal(0), _allAliensStunnedTotal(0)
 {
 }
 /**
@@ -107,6 +107,7 @@ void SoldierDiary::load(const YAML::Node& node)
 	_trapKillTotal = node["trapKillTotal"].as<int>(_trapKillTotal);
 	_alienBaseAssaultTotal = node["alienBaseAssaultTotal"].as<int>(_alienBaseAssaultTotal);
 	_allAliensKilledTotal = node["allAliensKilledTotal"].as<int>(_allAliensKilledTotal);
+    _allAliensStunnedTotal = node["_allAliensStunnedTotal"].as<int>(_allAliensStunnedTotal);
 }
 /**
  * Saves the diary to a YAML file.
@@ -154,6 +155,7 @@ YAML::Node SoldierDiary::save() const
 	if (_trapKillTotal) node["trapKillTotal"] = _trapKillTotal;
 	if (_alienBaseAssaultTotal) node["alienBaseAssaultTotal"] = _alienBaseAssaultTotal;
 	if (_allAliensKilledTotal) node["allAliensKilledTotal"] = _allAliensKilledTotal;
+    if (_allAliensStunnedTotal) node["_allAliensStunnedTotal"] = _allAliensStunnedTotal;
 	return node;
 }
 /**
@@ -224,6 +226,8 @@ void SoldierDiary::updateDiary(BattleUnitStatistics *unitStatistics, MissionStat
 		_KIA++;
 	if (unitStatistics->nikeCross)
 		_allAliensKilledTotal++;
+    if (unitStatistics->nikeCross)
+		_allAliensStunnedTotal++;
     _missionIdList.push_back(missionStatistics->id);
 }
 /**
@@ -301,7 +305,8 @@ bool SoldierDiary::manageCommendations(Ruleset *rules)
 					((*j).first == "isDead" && _KIA < (*j).second.at(nextCommendationLevel["noNoun"])) ||
 					((*j).first == "totalTrapKills" && _trapKillTotal < (*j).second.at(nextCommendationLevel["noNoun"])) ||
 					((*j).first == "totalAlienBaseAssaults" && _alienBaseAssaultTotal < (*j).second.at(nextCommendationLevel["noNoun"])) ||
-					((*j).first == "totalAllAliensKilled" && _allAliensKilledTotal < (*j).second.at(nextCommendationLevel["noNoun"])) )
+					((*j).first == "totalAllAliensKilled" && _allAliensKilledTotal < (*j).second.at(nextCommendationLevel["noNoun"])) || 
+                    ((*j).first == "totalAllAliensStunned" && _allAliensStunnedTotal < (*j).second.at(nextCommendationLevel["noNoun"])) ))
 			{
 				awardCommendationBool = false;
 				break;

src/Savegame/SoldierDiary.h

@@ -75,7 +75,7 @@ class SoldierDiary
 	int _scoreTotal, _killTotal, _winTotal, _stunTotal, _daysWoundedTotal, _baseDefenseMissionTotal, _totalShotByFriendlyCounter, _totalShotFriendlyCounter, _loneSurvivorTotal,
 		_terrorMissionTotal, _nightMissionTotal, _nightTerrorMissionTotal, _monthsService, _unconciousTotal, _shotAtCounterTotal, _hitCounterTotal, _ironManTotal,
 		_importantMissionTotal, _longDistanceHitCounterTotal, _lowAccuracyHitCounterTotal, _shotsFiredCounterTotal, _shotsLandedCounterTotal, _shotAtCounter10in1Mission,
-		_hitCounter5in1Mission, _reactionFireTotal, _timesWoundedTotal, _valiantCruxTotal, _KIA, _trapKillTotal, _alienBaseAssaultTotal, _allAliensKilledTotal;
+		_hitCounter5in1Mission, _reactionFireTotal, _timesWoundedTotal, _valiantCruxTotal, _KIA, _trapKillTotal, _alienBaseAssaultTotal, _allAliensKilledTotal, _allAliensStunnedTotal;
 	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: