Added new Hellraiser medal

Author: Shoes01

bin/data/Resources/Commendations/medal_111.png

@@ -83,6 +83,8 @@ extraStrings:
      STR_MEDAL_LONGEST_NIGHT_DESCRIPTION: "Given to a soldier who has witnessed the horrors of alien terror missions at night."
      STR_MEDAL_MEDAL_OF_HEROISM_NAME: "Medal of Heroism"
      STR_MEDAL_MEDAL_OF_HEROISM_DESCRIPTION: "Given to a soldier who has fought to the last ounce of strength."
+     STR_MEDAL_HELLRAISER_MEDAL_NAME: "Hellraiser Medal"
+     STR_MEDAL_HELLRAISER_MEDAL_DESCRIPITON: "Given to a soldier who has used incendiary weapons to kill aliens."
      STR_AWARD_0: "First award"
      STR_AWARD_1: "Second award"
      STR_AWARD_2: "Third award"
@@ -180,6 +182,8 @@ extraStrings:
      STR_MEDAL_LONGEST_NIGHT_DESCRIPTION: "Given to a soldier who has witnessed the horrors of alien terror missions at night."
      STR_MEDAL_MEDAL_OF_HEROISM_NAME: "Medal of Heroism"
      STR_MEDAL_MEDAL_OF_HEROISM_DESCRIPTION: "Given to a soldier who has fought to the last ounce of strength."
+     STR_MEDAL_HELLRAISER_MEDAL_NAME: "Hellraiser Medal"
+     STR_MEDAL_HELLRAISER_MEDAL_DESCRIPITON: "Given to a soldier who has used incendiary weapons to kill aliens."
      STR_AWARD_0: "First award"
      STR_AWARD_1: "Second award"
      STR_AWARD_2: "Third award"
@@ -221,6 +225,7 @@ extraStrings:
 #   total_night_terror_missions
 #   total_monthly_service
 #   total_fell_unconcious
+#   total_kills_with_fire (only Incendiary Rockets...)
 # 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.
@@ -282,5 +287,10 @@ commendations:
   - type: STR_MEDAL_MEDAL_OF_HEROISM_NAME
     description: STR_MEDAL_MEDAL_OF_HEROISM_DESCRIPTION
     sprite: 10
+    criteria:
+      total_fell_unconcious: [1, 2, 3, 4, 5, 7, 9, 11, 15, 20]
+  - type: STR_MEDAL_HELLRAISER_MEDAL_NAME
+    description: STR_MEDAL_HELLRAISER_MEDAL_DESCRIPTION
+    sprite: 11
     criteria:
       total_fell_unconcious: [1, 2, 3, 4, 5, 7, 9, 11, 15, 20]

bin/data/Ruleset/Commendations.rul

@@ -582,6 +582,10 @@ void BattlescapeGame::checkForCasualties(BattleItem *murderweapon, BattleUnit *m
 				if (murderer->getGeoscapeSoldier() && murderer->getFaction() == FACTION_PLAYER)
 				{
 					murderer->getMissionStatistics()->kills.push_back(new SoldierDiaryKills(_alienRank, _alienRace, _weapon, _weaponAmmo, _alienState));
+					if (_weaponAmmo == "STR_INCENDIARY_ROCKET")
+					{
+						murderer->getMissionStatistics()->killsWithFire++;
+					}
 				}
 				murderer->addKillCount();
 				victim->killedBy(murderer->getFaction());

src/Battlescape/BattlescapeGame.cpp

@@ -33,6 +33,7 @@ void Statistics::load(const YAML::Node& node)
 		for (YAML::const_iterator i = YAMLkills.begin(); i != YAMLkills.end(); ++i)
 			kills.push_back(new SoldierDiaryKills(*i));
 	}
+	killsWithFire = node["killsWithFire"].as<int>(killsWithFire);
 }
 
 YAML::Node Statistics::save() const
@@ -44,6 +45,7 @@ YAML::Node Statistics::save() const
 		for (std::vector<SoldierDiaryKills*>::const_iterator i = kills.begin() ; i != kills.end() ; ++i)
 			node["kills"].push_back((*i)->save());
 	}
+	node["killsWithFire"] = killsWithFire;
 	return node;
 }
 
@@ -185,7 +187,8 @@ void SoldierDiary::updateDiary()
     if (latestEntry->getMissionStatistics()->wasUnconcious)
     {
         _unconciousTotal++;
-    }	
+    }
+	_killsWithFireTotal += latestEntry->getMissionStatistics()->killsWithFire;
 }
 
 /**
@@ -402,7 +405,8 @@ bool SoldierDiary::manageCommendations(Ruleset *rules)
 					((*j).first == "total_night_missions" && getNightMissionTotal() < (*j).second.at(_nextCommendationLevel[""])) ||
 					((*j).first == "total_night_terror_missions" && getNightTerrorMissionTotal() < (*j).second.at(_nextCommendationLevel[""])) ||
 					((*j).first == "total_monthly_service" && _monthsService < (*j).second.at(_nextCommendationLevel[""])) ||
-					((*j).first == "total_fell_unconcious" && _unconciousTotal < (*j).second.at(_nextCommendationLevel[""])) )
+					((*j).first == "total_fell_unconcious" && _unconciousTotal < (*j).second.at(_nextCommendationLevel[""])) ||
+					((*j).first == "total_kills_with_fire" && _killsWithFireTotal < (*j).second.at(_nextCommendationLevel[""])) )
 			{
 				_awardCommendation = false;
 				break;

src/Savegame/SoldierDiary.cpp

@@ -73,11 +73,12 @@ struct Statistics
 {
 	bool wasUnconcious;									// Tracks if the soldier fell unconcious
     std::vector<SoldierDiaryKills*> kills;				// Tracks kills
+	int killsWithFire;									// Tracks kills with fire (currently only Incendiary Rockets)
 
 	void load(const YAML::Node& node);					// Load function
 	YAML::Node save() const;							// Save function
 	Statistics(const YAML::Node& node) { load(node); }	// Constructor from YAML (needed?)
-	Statistics() : wasUnconcious(false), kills() { }	// Default constructor
+	Statistics() : wasUnconcious(false), kills(), killsWithFire(0) { }	// Default constructor
 	~Statistics();										// Deconstructor
 };
 
@@ -193,7 +194,7 @@ class SoldierDiary
 	RuleCommendations *_rules;
 	std::map<std::string, int> _alienRankTotal, _alienRaceTotal, _weaponTotal, _weaponAmmoTotal, _regionTotal, _countryTotal, _typeTotal, _UFOTotal;
 	int _scoreTotal, _killTotal, _missionTotal, _winTotal, _stunTotal, _daysWoundedTotal, _baseDefenseMissionTotal,
-		_terrorMissionTotal, _nightMissionTotal, _nightTerrorMissionTotal, _monthsService, _unconciousTotal;
+		_terrorMissionTotal, _nightMissionTotal, _nightTerrorMissionTotal, _monthsService, _unconciousTotal, _killsWithFireTotal;
 
 	void manageModularCommendations(std::map<std::string, int> nextCommendationLevel, std::map<std::string, int> modularCommendations, std::pair<std::string, int> statTotal, int criteria);
 public: