- Fixed support for soldier armor.

- Added death sounds to ruleset.

Author: SupSuper

src/Basescape/CraftArmorState.cpp

@@ -31,6 +31,7 @@
 #include "../Savegame/Soldier.h"
 #include "../Savegame/Craft.h"
 #include "../Ruleset/RuleCraft.h"
+#include "../Ruleset/Armor.h"
 #include "SoldierArmorState.h"
 
 namespace OpenXcom
@@ -96,7 +97,7 @@ CraftArmorState::CraftArmorState(Game *game, Base *base, unsigned int craft) : S
 	Craft *c = _base->getCrafts()->at(_craft);
 	for (std::vector<Soldier*>::iterator i = _base->getSoldiers()->begin(); i != _base->getSoldiers()->end(); ++i)
 	{
-		_lstSoldiers->addRow(3, (*i)->getName().c_str(), (*i)->getCraftString(_game->getLanguage()).c_str(), _game->getLanguage()->getString("STR_NONE_UC").c_str());
+		_lstSoldiers->addRow(3, (*i)->getName().c_str(), (*i)->getCraftString(_game->getLanguage()).c_str(), _game->getLanguage()->getString((*i)->getArmor()->getType()).c_str());
 
 		Uint8 color;
 		if ((*i)->getCraft() == c)

src/Basescape/SoldierInfoState.cpp

@@ -34,6 +34,7 @@
 #include "../Ruleset/RuleCraft.h"
 #include "../Savegame/Soldier.h"
 #include "../Engine/SurfaceSet.h"
+#include "../Ruleset/Armor.h"
 #include "SoldierArmorState.h"
 
 namespace OpenXcom
@@ -342,7 +343,7 @@ void SoldierInfoState::init()
 	_barStrength->setValue(current->strength);
 	_barStrength->setValue2(initial->strength);
 
-	_txtArmor->setText(_game->getLanguage()->getString("STR_NONE_UC"));
+	_txtArmor->setText(_game->getLanguage()->getString(s->getArmor()->getType()));
 
 	std::wstringstream ss9;
 	ss9 << _game->getLanguage()->getString("STR_RANK_") << L'\x01' << _game->getLanguage()->getString(s->getRankString());

src/Battlescape/UnitDieBState.cpp

@@ -87,16 +87,7 @@ void UnitDieBState::init()
 		}
 		else
 		{
-			// todo get death sound from Unit
-			if (_unit->getArmor()->getSize() > 1)
-			{
-				// HWP destroy sound
-				_parent->getResourcePack()->getSoundSet("BATTLE.CAT")->getSound(23)->play();
-			}
-			else
-			{
-				_parent->getResourcePack()->getSoundSet("BATTLE.CAT")->getSound(10)->play();
-			}
+			_parent->getResourcePack()->getSoundSet("BATTLE.CAT")->getSound(_unit->getDeathSound())->play();
 		}
 	}
 

src/Ruleset/Ruleset.cpp

@@ -21,6 +21,7 @@
 #include "yaml.h"
 #include "../Engine/Options.h"
 #include "../Engine/Exception.h"
+#include "../Engine/CrossPlatform.h"
 #include "SoldierNamePool.h"
 #include "RuleCountry.h"
 #include "RuleRegion.h"
@@ -50,6 +51,16 @@ namespace OpenXcom
 Ruleset::Ruleset() : _names(), _countries(), _regions(), _facilities(), _crafts(), _craftWeapons(), _items(), _ufos(),
 					 _terrains(), _mapDataSets(), _soldiers(), _units(), _invs(), _costSoldier(0), _costEngineer(0), _costScientist(0), _timePersonnel(0)
 {
+	// Add soldier names
+	std::vector<std::string> names = CrossPlatform::getFolderContents(Options::getDataFolder() + "SoldierName/", "nam");
+
+	for (std::vector<std::string>::iterator i = names.begin(); i != names.end(); ++i)
+	{
+		std::string file = (*i).substr(0, (*i).length()-4);
+		SoldierNamePool *pool = new SoldierNamePool();
+		pool->load(file);
+		_names.push_back(pool);
+	}
 }
 
 /**

src/Ruleset/XcomRuleset.cpp

@@ -2069,6 +2069,7 @@ XcomRuleset::XcomRuleset() : Ruleset()
 	sectoidSoldier->setStats(s1);
 	sectoidSoldier->setVoxelParameters(16, 12, 2);
 	sectoidSoldier->setValue(10);
+	sectoidSoldier->setDeathSound(10);
 	sectoidSoldier->setAIParameters(3, 2);
 
 	Unit *sectoidEngineer = new Unit("SECTOID_ENGINEER", "STR_SECTOID", "STR_LIVE_ENGINEER");
@@ -2087,6 +2088,7 @@ XcomRuleset::XcomRuleset() : Ruleset()
 	sectoidEngineer->setStats(s1);
 	sectoidEngineer->setVoxelParameters(16, 12, 2);
 	sectoidEngineer->setValue(16);
+	sectoidEngineer->setDeathSound(10);
 	sectoidEngineer->setAIParameters(6, 2);
 
 	Unit *sectoidNavigator = new Unit("SECTOID_NAVIGATOR", "STR_SECTOID", "STR_LIVE_NAVIGATOR");
@@ -2105,6 +2107,7 @@ XcomRuleset::XcomRuleset() : Ruleset()
 	sectoidNavigator->setStats(s1);
 	sectoidNavigator->setVoxelParameters(16, 12, 2);
 	sectoidNavigator->setValue(12);
+	sectoidNavigator->setDeathSound(10);
 	sectoidNavigator->setAIParameters(4, 2);
 
 	Unit *cyberdisc = new Unit("CYBERDISC", "STR_CYBERDISC", "");
@@ -2123,6 +2126,7 @@ XcomRuleset::XcomRuleset() : Ruleset()
 	cyberdisc->setStats(s1);
 	cyberdisc->setVoxelParameters(15, 15, 4);
 	cyberdisc->setValue(20);
+	cyberdisc->setDeathSound(23);
 	cyberdisc->setAIParameters(5, 1);
 	cyberdisc->setSpecialAbility(SPECAB_EXPLODEONDEATH);
 
@@ -2142,6 +2146,7 @@ XcomRuleset::XcomRuleset() : Ruleset()
 	floaterSoldier->setStats(s1);
 	floaterSoldier->setVoxelParameters(21, 16, 3);
 	floaterSoldier->setValue(12);
+	floaterSoldier->setDeathSound(10);
 	floaterSoldier->setAIParameters(4, 2);
 
 	Unit *tankCannon = new Unit("TANK_CANNON", "STR_TANK_CANNON", "");
@@ -2160,6 +2165,7 @@ XcomRuleset::XcomRuleset() : Ruleset()
 	tankCannon->setStats(s1);
 	tankCannon->setVoxelParameters(15, 15, 4);
 	tankCannon->setValue(20);
+	tankCannon->setDeathSound(23);
 
 	_units.insert(std::pair<std::string, Unit*>("SECTOID_SOLDIER", sectoidSoldier));
 	_units.insert(std::pair<std::string, Unit*>("SECTOID_ENGINEER", sectoidEngineer));

src/Savegame/BattleUnit.cpp

@@ -48,25 +48,15 @@ BattleUnit::BattleUnit(Soldier *soldier, UnitFaction faction) : _faction(faction
 	_id = soldier->getId();
 	_type = "SOLDIER";
 	_rank = soldier->getRankString();
-	_stats.bravery = soldier->getCurrentStats()->bravery;
-	_stats.firing = soldier->getCurrentStats()->firing;
-	_stats.health = soldier->getCurrentStats()->health;
-	_stats.melee = soldier->getCurrentStats()->melee;
-	_stats.psiSkill = soldier->getCurrentStats()->psiSkill;
-	_stats.psiStrength = soldier->getCurrentStats()->psiStrength;
-	_stats.reactions = soldier->getCurrentStats()->reactions;
-	_stats.stamina = soldier->getCurrentStats()->stamina;
-	_stats.strength = soldier->getCurrentStats()->strength;
-	_stats.throwing = soldier->getCurrentStats()->throwing;
-	_stats.tu = soldier->getCurrentStats()->tu;
+	_stats = *soldier->getCurrentStats();
 	_standHeight = soldier->getRules()->getStandHeight();
 	_kneelHeight = soldier->getRules()->getKneelHeight();
 	_loftemps = soldier->getRules()->getLoftemps();
 	_deathSound = 0; // this one is hardcoded
 	_intelligence = 2;
 	_aggression = 1;
 	_specab = SPECAB_NONE;
-	_armor = soldier->getArmorData();
+	_armor = soldier->getArmor();
 	_gender = soldier->getGender();
 
 	int rankbonus = 0;
@@ -108,17 +98,7 @@ BattleUnit::BattleUnit(Unit *unit, UnitFaction faction, Armor *armor) : _faction
 	_type = unit->getType();
 	_rank = unit->getRank();
 	_race = unit->getRace();
-	_stats.bravery = unit->getStats()->bravery;
-	_stats.firing = unit->getStats()->firing;
-	_stats.health = unit->getStats()->health;
-	_stats.melee = unit->getStats()->melee;
-	_stats.psiSkill = unit->getStats()->psiSkill;
-	_stats.psiStrength = unit->getStats()->psiStrength;
-	_stats.reactions = unit->getStats()->reactions;
-	_stats.stamina = unit->getStats()->stamina;
-	_stats.strength = unit->getStats()->strength;
-	_stats.throwing = unit->getStats()->throwing;
-	_stats.tu = unit->getStats()->tu;
+	_stats = *unit->getStats();
 	_standHeight = unit->getStandHeight();
 	_kneelHeight = unit->getKneelHeight();
 	_loftemps = unit->getLoftemps();
@@ -1764,6 +1744,7 @@ int BattleUnit::getLoftemps() const
 {
 	return _loftemps;
 }
+
 /**
   * Get the unit's value. Used for score at debriefing.
   * @return value score
@@ -1773,6 +1754,15 @@ int BattleUnit::getValue() const
 	return _value;
 }
 
+/**
+ * Get the unit's death sound.
+ * @return id.
+ */
+int BattleUnit::getDeathSound() const
+{
+	return _deathSound;
+}
+
 /**
   * Get whether the unit is affected by fatal wounds.
   * Normally only soldiers are affected by fatal wounds.

src/Savegame/BattleUnit.h

@@ -288,6 +288,8 @@ class BattleUnit
 	int getLoftemps() const;
 	/// Get the unit's value.
 	int getValue() const;
+	/// Get the unit's death sound.
+	int getDeathSound() const;
 	/// Get whether the unit is affected by fatal wounds.
 	bool isWoundable() const;
 	/// Get whether the unit is affected by fear.

src/Savegame/Soldier.cpp

@@ -371,12 +371,24 @@ bool Soldier::isPromoted()
 	return promoted;
 }
 
-/// Gets a pointer to the armor data.
-Armor *Soldier::getArmorData() const
+/**
+ * Returns the unit's current armor.
+ * @return Pointer to armor data.
+ */
+Armor *const Soldier::getArmor() const
 {
 	return _armor;
 }
 
+/**
+ * Changes the unit's current armor.
+ * @param armor Pointer to armor data.
+ */
+void Soldier::setArmor(Armor *armor)
+{
+	_armor = armor;
+}
+
 /**
  * Returns the amount of time until the soldier is healed.
  * @return Number of days.

src/Savegame/Soldier.h

@@ -94,8 +94,6 @@ class Soldier
 	SoldierGender getGender() const;
 	/// Gets the soldier's look.
 	SoldierLook getLook() const;
-	/// Gets a string version of the soldier's armor.
-	std::string getArmor() const;
 	/// Gets soldier rules.
 	RuleSoldier *getRules() const;
 	/// Gets the soldier's unique ID.
@@ -110,8 +108,10 @@ class Soldier
 	UnitStats *getCurrentStats();
 	/// Get whether the unit was recently promoted.
 	bool isPromoted();
-	/// Gets a pointer to the armor data.
-	Armor *getArmorData() const;
+	/// Gets the soldier armor.
+	Armor *const getArmor() const;
+	/// Sets the soldier armor.
+	void setArmor(Armor *armor);
 	/// Gets the soldier's wound recovery time.
 	int getWoundRecovery() const;
 	/// Sets the soldier's wound recovery time.