Fixed width of Mission Details, sorted Psi related stats on kill screen

Author: Shoes01

bin/standard/Commendations/Commendations.rul

@@ -909,7 +909,7 @@ extraStrings:
      STR_AWARD_DECOR_7: "First Broche d'Or"
      STR_AWARD_DECOR_8: "Second Broche d'Or"
      STR_AWARD_DECOR_9: "Troisième Broche d'Or"
-     STR_MISSION_DETAILS: "DETAILS DE MISSIONS POUR{NEWLINE}{0}"
+     STR_MISSION_DETAILS: "DETAILS DE MISSIONS"
      STR_DETAILS_UC: "DETAILS"
      STR_TANK: "Blindé"
      STR_HEAVY_WEAPONS_PLATFORM_LC: "Plateforme d'armement lourde"
@@ -1049,7 +1049,7 @@ extraStrings:
      STR_SCORE_VALUE: "ОЧКОВ> {ALT}{0}"
      STR_WINS: "ПОБЕД> {ALT}{0}"
      STR_STUNS: "ЗАДЕРЖАНО> {ALT}{0}"
-     STR_MISSION_DETAILS: "СВЕДЕНИЯ ОБ ОПЕРАЦИИ ДЛЯ{NEWLINE}{0}"
+     STR_MISSION_DETAILS: "СВЕДЕНИЯ ОБ ОПЕРАЦИИ"
      STR_DETAILS_UC: "СВЕДЕНИЯ"
      STR_TANK: "Танк"
      STR_HEAVY_WEAPONS_PLATFORM_LC: "Тяжелая Боевая Платформа" 
@@ -1175,7 +1175,7 @@ extraStrings:
       STR_MISSIONS_BY_UFO: Missioni per UFO
       STR_MISSIONS_TYPE: Missioni
       STR_MISSIONS_UC: Missioni
-      STR_MISSION_DETAILS: "Dettagli Missione per {NEWLINE}{0}"
+      STR_MISSION_DETAILS: "Dettagli Missione"
       STR_MISSION_LOSS: Sconfitte
       STR_MISSION_TYPE: "Missione> {ALT}{0}"
       STR_MISSION_WIN: Vittorie

bin/standard/xcom1/Language/en-US.yml

@@ -1057,7 +1057,7 @@ en-US:
   STR_KILLED: "KILLED"
   STR_STUNNED: "STUNNED"
   STR_PANICKED: "PANICKED"
-  STR_MINDCONTROLLED: "MIND CONTROLLED"
+  STR_MINDCONTROLLED: "CONTROLLED"
   STR_REGION_UNKNOWN: "Undisclosed location"
   STR_WEAPON_UNKNOWN: "Improvisation"
   STR_MISSION_WIN: "Victory"
@@ -1091,6 +1091,8 @@ en-US:
   STR_SCORE_VALUE: "SCORE> {ALT}{0}"
   STR_WINS: "WINS> {ALT}{0}"
   STR_STUNS: "STUNS> {ALT}{0}"
+  STR_PANICKS: "PANICKS> {ALT}{0}"
+  STR_CONTROLS: "CONTROLS> {ALT}{0}"
   STR_DETAILS_UC: "DETAILS"
   STR_TANK: "Tank"
   STR_HEAVY_WEAPONS_PLATFORM_LC: "Heavy Weapons Platform"

src/Basescape/SoldierDiaryMissionState.cpp

@@ -56,17 +56,17 @@ SoldierDiaryMissionState::SoldierDiaryMissionState(Base *base, size_t soldierId,
 	_screen = false;
 
 	// Create objects
-	_window = new Window(this, 232, 128, 44, 36, POPUP_BOTH);
-	_btnOk = new TextButton(180, 16, 70, 140);
+	_window = new Window(this, 272, 128, 24, 36, POPUP_BOTH);
+	_btnOk = new TextButton(220, 16, 50, 140);
 	_txtTitle = new Text(222, 9, 49, 44);
-	_txtScore = new Text(222, 9, 49, 62);
-	_txtMissionType= new Text(222, 9, 49, 71);
-	_txtUFO = new Text(222, 9, 49, 80);
-	_txtKills = new Text(130, 9, 187, 62);
-	_txtRace = new Text(130, 9, 187, 71);
-	_txtDaylight = new Text(130, 9, 187, 80);
-	_txtDaysWounded = new Text(130, 9, 187, 89);
-	_lstKills = new TextList(200, 32, 49, 102);
+	_txtScore = new Text(222, 9, 29, 62);
+	_txtMissionType= new Text(222, 9, 29, 71);
+	_txtUFO = new Text(222, 9, 29, 80);
+	_txtKills = new Text(130, 9, 207, 62);
+	_txtRace = new Text(130, 9, 207, 71);
+	_txtDaylight = new Text(130, 9, 207, 80);
+	_txtDaysWounded = new Text(130, 9, 207, 89);
+	_lstKills = new TextList(240, 32, 29, 102);
 
 	// Set palette
 	setPalette("PAL_BASESCAPE");
@@ -155,7 +155,7 @@ SoldierDiaryMissionState::SoldierDiaryMissionState(Base *base, size_t soldierId,
 
 	_lstKills->setColor(Palette::blockOffset(13));
 	_lstKills->setArrowColor(Palette::blockOffset(13)+5);
-	_lstKills->setColumns(3, 40, 90, 80);
+	_lstKills->setColumns(3, 60, 90, 90);
 	_lstKills->setSelectable(false);
 	_lstKills->setBackground(_window);
 	_lstKills->setMargin(8);
@@ -182,7 +182,7 @@ SoldierDiaryMissionState::SoldierDiaryMissionState(Base *base, size_t soldierId,
             count++;
             stunOrKill = true;
 		}
-		else if ((*j)->getUnitStatusString() == "STATUS_STUNNED")
+		else if ((*j)->getUnitStatusString() == "STATUS_UNCONSCIOUS")
 		{
 			wssStatus << tr("STR_STUNNED").c_str();
             stunOrKill = true;

src/Basescape/SoldierDiaryPerformanceState.cpp

@@ -234,7 +234,7 @@ SoldierDiaryPerformanceState::SoldierDiaryPerformanceState(Base *base, size_t so
 
 	_lstKillTotals->setColor(Palette::blockOffset(15)+1);
 	_lstKillTotals->setSecondaryColor(Palette::blockOffset(13)+10);
-	_lstKillTotals->setColumns(2, 98, 98);
+	_lstKillTotals->setColumns(4, 68, 68, 68, 84);
 	_lstKillTotals->setMargin(8);
 	_lstKillTotals->setBackground(_window);
 
@@ -307,7 +307,6 @@ SoldierDiaryPerformanceState::~SoldierDiaryPerformanceState()
 
 /**
  *  Clears all the variables and reinitializes the list of kills or missions for the soldier.
- *
  */
 void SoldierDiaryPerformanceState::init()
 {
@@ -379,8 +378,18 @@ void SoldierDiaryPerformanceState::init()
 	_lstKillTotals->clearList();
 	_lstMissionTotals->clearList();
 	_commendationsListEntry.clear();
-	_lstKillTotals->addRow(2, tr("STR_KILLS").arg(_soldier->getDiary()->getKillTotal()).c_str(),
-							  tr("STR_STUNS").arg(_soldier->getDiary()->getStunTotal()).c_str());
+	if (_soldier->getCurrentStats()->psiSkill > 0 || (Options::psiStrengthEval && _game->getSavedGame()->isResearched(_game->getRuleset()->getPsiRequirements())))
+	{
+		_lstKillTotals->addRow(4, tr("STR_KILLS").arg(_soldier->getDiary()->getKillTotal()).c_str(),
+								  tr("STR_STUNS").arg(_soldier->getDiary()->getStunTotal()).c_str(),
+								  tr("STR_PANICKS").arg(_soldier->getDiary()->getPanickTotal()).c_str(),
+								  tr("STR_CONTROLS").arg(_soldier->getDiary()->getControlTotal()).c_str());
+	}
+	else
+	{
+		_lstKillTotals->addRow(2, tr("STR_KILLS").arg(_soldier->getDiary()->getKillTotal()).c_str(),
+								  tr("STR_STUNS").arg(_soldier->getDiary()->getStunTotal()).c_str());
+	}
 	_lstMissionTotals->addRow(4, tr("STR_MISSIONS").arg(_soldier->getDiary()->getMissionTotal()).c_str(),
 								 tr("STR_WINS").arg(_soldier->getDiary()->getWinTotal()).c_str(),
 								 tr("STR_SCORE_VALUE").arg(_soldier->getDiary()->getScoreTotal()).c_str(),

src/Savegame/SoldierDiary.cpp

@@ -41,7 +41,7 @@ SoldierDiary::SoldierDiary() : _killList(), _regionTotal(), _countryTotal(), _ty
     _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), _statGainTotal(0), _revivedUnitTotal(0), _wholeMedikitTotal(0), _braveryGainTotal(0), _bestOfRank(0),
-    _bestSoldier(false), _MIA(0), _martyrKillsTotal(0), _postMortemKills(0), _globeTrotter(false), _slaveKillsTotal(0)
+    _bestSoldier(false), _MIA(0), _martyrKillsTotal(0), _postMortemKills(0), _globeTrotter(false), _slaveKillsTotal(0), _panickTotal(0), _controlTotal(0)
 {
 }
 /**
@@ -123,6 +123,8 @@ void SoldierDiary::load(const YAML::Node& node)
     _postMortemKills = node["postMortemKills"].as<int>(_postMortemKills);
 	_globeTrotter = node["globeTrotter"].as<bool>(_globeTrotter);
 	_slaveKillsTotal = node["slaveKillsTotal"].as<int>(_slaveKillsTotal);
+    _panickTotal = node["panickTotal"].as<int>(_panickTotal);
+    _controlTotal = node["controlTotal"].as<int>(_controlTotal);
 }
 /**
  * Saves the diary to a YAML file.
@@ -184,6 +186,8 @@ YAML::Node SoldierDiary::save() const
     if (_postMortemKills) node["postMortemKills"] = _postMortemKills;
 	if (_globeTrotter) node["globeTrotter"] = _globeTrotter;
 	if (_slaveKillsTotal) node["slaveKillsTotal"] = _slaveKillsTotal;
+    if (_panickTotal) node["panickTotal"] =_panickTotal;
+    if (_controlTotal) node["controlTotal"] = _controlTotal;
 	return node;
 }
 /**
@@ -208,6 +212,14 @@ void SoldierDiary::updateDiary(BattleUnitStatistics *unitStatistics, MissionStat
             {
                 _stunTotal++;
             }
+            else if ((*kill)->getUnitStatusString() == "STATUS_PANICKING")
+            {
+                _panickTotal++;
+            }
+            else if ((*kill)->getUnitStatusString() == "STATUS_TURNING")
+            {
+                _controlTotal++;
+            }
             if ((*kill)->hostileTurn())
             {
                 if (rules->getItem((*kill)->weapon)->getBattleType() == BT_GRENADE || rules->getItem((*kill)->weapon)->getBattleType() == BT_PROXIMITYGRENADE)
@@ -764,6 +776,20 @@ int SoldierDiary::getStunTotal() const
 {
 	return _stunTotal;
 }
+/**
+ * 
+ */
+int SoldierDiary::getPanickTotal() const
+{
+    return _panickTotal;
+}
+/**
+ *
+ */
+int SoldierDiary::getControlTotal() const
+{
+    return _controlTotal;
+}
 /**
  *
  */

src/Savegame/SoldierDiary.h

@@ -77,7 +77,7 @@ class SoldierDiary
 		_importantMissionTotal, _longDistanceHitCounterTotal, _lowAccuracyHitCounterTotal, _shotsFiredCounterTotal, _shotsLandedCounterTotal, _shotAtCounter10in1Mission,
 		_hitCounter5in1Mission, _reactionFireTotal, _timesWoundedTotal, _valiantCruxTotal, _KIA, _trapKillTotal, _alienBaseAssaultTotal, _allAliensKilledTotal, _allAliensStunnedTotal,
         _woundsHealedTotal, _allUFOs, _allMissionTypes, _statGainTotal, _revivedUnitTotal, _wholeMedikitTotal, _braveryGainTotal, _bestOfRank, _MIA, _martyrKillsTotal, _postMortemKills,
-        _slaveKillsTotal;
+        _slaveKillsTotal, _panickTotal, _controlTotal;
     bool _bestSoldier, _globeTrotter;
 	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");
@@ -120,6 +120,10 @@ class SoldierDiary
 	int getWinTotal() const;
 	/// Get the total number of stuns.
 	int getStunTotal() const;
+    /// Get the total number of psi panicks.
+    int getPanickTotal() const;
+    /// Get the total number of psi mind controls.
+    int getControlTotal() const;
 	/// Get the total number of days wounded.
 	int getDaysWoundedTotal() const;
 	/// Get the solder's commendations.