Merge pull request OpenXcom#461 from redv/psionic_training

Warboy1982 · Warboy1982 · commit 0b989ebaec06 · 2013-06-10T07:32:04.000-07:00
Psionic training
diff --git a/bin/data/Language/Bulgarian.lng b/bin/data/Language/Bulgarian.lng
@@ -2371,6 +2371,10 @@ STR_ALLOWPSIONICCAPTURE
 Allow psi-capture
 STR_ALLOWPSIONICCAPTURE_DESC
 Mind-controlling all remaining aliens results in victory, and they count as live captures.
+STR_ANYTIMEPSITRAINING
+Psionic training at any time
+STR_ANYTIMEPSITRAINING_DESC
+You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
 STR_NOT_ENOUGH_SPACE
 Not Enough Space!
 STR_WEAPONSELFDESTRUCTION
diff --git a/bin/data/Language/Czech.lng b/bin/data/Language/Czech.lng
@@ -2377,6 +2377,10 @@ STR_ALLOWPSIONICCAPTURE
 Povolit psionická zajmutí
 STR_ALLOWPSIONICCAPTURE_DESC
 Psionické ovládnutí zbývajících cizáků ukončí úspěšně misi. Ovládnutí cizáci jsou zajmuti živí.
+STR_ANYTIMEPSITRAINING
+Psionic training at any time
+STR_ANYTIMEPSITRAINING_DESC
+You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
 STR_NOT_ENOUGH_SPACE
 Nedostatek místa.
 STR_WEAPONSELFDESTRUCTION
diff --git a/bin/data/Language/Danish.lng b/bin/data/Language/Danish.lng
@@ -2375,6 +2375,10 @@ STR_ALLOWPSIONICCAPTURE
 Allow psi-capture
 STR_ALLOWPSIONICCAPTURE_DESC
 Mind-controlling all remaining aliens results in victory, and they count as live captures.
+STR_ANYTIMEPSITRAINING
+Psionic training at any time
+STR_ANYTIMEPSITRAINING_DESC
+You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
 STR_NOT_ENOUGH_SPACE
 Not Enough Space!
 STR_WEAPONSELFDESTRUCTION
diff --git a/bin/data/Language/English.lng b/bin/data/Language/English.lng
@@ -2375,6 +2375,10 @@ STR_ALLOWPSIONICCAPTURE
 Allow psi-capture
 STR_ALLOWPSIONICCAPTURE_DESC
 Mind-controlling all remaining aliens results in victory, and they count as live captures.
+STR_ANYTIMEPSITRAINING
+Psionic training at any time
+STR_ANYTIMEPSITRAINING_DESC
+You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
 STR_NOT_ENOUGH_SPACE
 Not Enough Space!
 STR_WEAPONSELFDESTRUCTION
diff --git a/bin/data/Language/EnglishUk.lng b/bin/data/Language/EnglishUk.lng
@@ -2375,6 +2375,10 @@ STR_ALLOWPSIONICCAPTURE
 Allow psi-capture
 STR_ALLOWPSIONICCAPTURE_DESC
 Mind-controlling all remaining aliens results in victory, and they count as live captures.
+STR_ANYTIMEPSITRAINING
+Psionic training at any time
+STR_ANYTIMEPSITRAINING_DESC
+You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
 STR_NOT_ENOUGH_SPACE
 Not Enough Space!
 STR_WEAPONSELFDESTRUCTION
diff --git a/bin/data/Language/French.lng b/bin/data/Language/French.lng
@@ -2371,6 +2371,10 @@ STR_ALLOWPSIONICCAPTURE
 Victoire par psi-captures
 STR_ALLOWPSIONICCAPTURE_DESC
 Autoriser la victoire par psi-capture. Les aliens sont considérés comme capturés vivants.
+STR_ANYTIMEPSITRAINING
+Psionic training at any time
+STR_ANYTIMEPSITRAINING_DESC
+You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
 STR_NOT_ENOUGH_SPACE
 Not Enough Space!
 STR_WEAPONSELFDESTRUCTION
diff --git a/bin/data/Language/German.lng b/bin/data/Language/German.lng
@@ -2371,6 +2371,10 @@ STR_ALLOWPSIONICCAPTURE
 Aktiviere Gefangennahme durch PSI-Gedankenkontrolle
 STR_ALLOWPSIONICCAPTURE_DESC
 Übernahme eines Aliens durch Gedankenkontrolle über das Missionsende hinaus zählt als Gefangennahme.{NEWLINE}Wenn nur noch durch den Spieler kontrollierte Aliens übrig sind gilt die Mission als gewonnen.
+STR_ANYTIMEPSITRAINING
+Psionic training at any time
+STR_ANYTIMEPSITRAINING_DESC
+You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
 STR_NOT_ENOUGH_SPACE
 Not Enough Space!
 STR_WEAPONSELFDESTRUCTION
diff --git a/bin/data/Language/Hungarian.lng b/bin/data/Language/Hungarian.lng
@@ -2369,6 +2369,10 @@ STR_ALLOWPSIONICCAPTURE
 Psi-elfogás engedélyezése
 STR_ALLOWPSIONICCAPTURE_DESC
 Az összes megmaradt élő idegen elmekontroll alá vonása a csata győzelmét eredményezi, és mindegyik élve elfogott idegennek számít.
+STR_ANYTIMEPSITRAINING
+Psionic training at any time
+STR_ANYTIMEPSITRAINING_DESC
+You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
 STR_NOT_ENOUGH_SPACE
 Not Enough Space!
 STR_WEAPONSELFDESTRUCTION
diff --git a/bin/data/Language/Italian.lng b/bin/data/Language/Italian.lng
@@ -2375,6 +2375,10 @@ STR_ALLOWPSIONICCAPTURE
 Abilita la cattura psi
 STR_ALLOWPSIONICCAPTURE_DESC
 Controllare mentalmente tutti gli alieni rimanenti porta alla vittoria, e loro contano come alieni vivi.
+STR_ANYTIMEPSITRAINING
+Psionic training at any time
+STR_ANYTIMEPSITRAINING_DESC
+You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
 STR_NOT_ENOUGH_SPACE
 Not Enough Space!
 STR_WEAPONSELFDESTRUCTION
diff --git a/bin/data/Language/Polish.lng b/bin/data/Language/Polish.lng
@@ -2381,6 +2381,10 @@ STR_ALLOWPSIONICCAPTURE
 Przechwycenie psioniczne
 STR_ALLOWPSIONICCAPTURE_DESC
 Kontrola jaźni nad wszystkimi pozostałymi przy życiu obcymi pozwala zakończyć misję. Są traktowani jako zneutralizowani{NEWLINE}i schwytani żywi.
+STR_ANYTIMEPSITRAINING
+Psionic training at any time
+STR_ANYTIMEPSITRAINING_DESC
+You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
 STR_NOT_ENOUGH_SPACE
 Niewystarczająca ilość miejsca!
 STR_WEAPONSELFDESTRUCTION
diff --git a/bin/data/Language/Portuguese.lng b/bin/data/Language/Portuguese.lng
@@ -2375,6 +2375,10 @@ STR_ALLOWPSIONICCAPTURE
 Psi-captura
 STR_ALLOWPSIONICCAPTURE_DESC
 O jogador vence a missão se os inimigos restantes estiverem sob controlo mental, sendo capturados vivos.
+STR_ANYTIMEPSITRAINING
+Psionic training at any time
+STR_ANYTIMEPSITRAINING_DESC
+You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
 STR_NOT_ENOUGH_SPACE
 Not Enough Space!
 STR_WEAPONSELFDESTRUCTION
diff --git a/bin/data/Language/Romanian.lng b/bin/data/Language/Romanian.lng
@@ -2375,6 +2375,10 @@ STR_ALLOWPSIONICCAPTURE
 Permite captura psi
 STR_ALLOWPSIONICCAPTURE_DESC
 Controlul mental al tuturor extratereștrilor rămași finalizează automat misiunea și capturarea acestora ca fiind vii.
+STR_ANYTIMEPSITRAINING
+Psionic training at any time
+STR_ANYTIMEPSITRAINING_DESC
+You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
 STR_NOT_ENOUGH_SPACE
 Insuficient Spațiu!
 STR_WEAPONSELFDESTRUCTION
diff --git a/bin/data/Language/Russian.lng b/bin/data/Language/Russian.lng
@@ -2377,6 +2377,10 @@ STR_ALLOWPSIONICCAPTURE
 Разрешить пси-захват
 STR_ALLOWPSIONICCAPTURE_DESC
 При победе все оставшиеся под контролем сознания пришельцы будут считаться захваченными в плен.
+STR_ANYTIMEPSITRAINING
+Псионическая тренировка в любое время
+STR_ANYTIMEPSITRAINING_DESC
+Вы можете в любое время отправить солдат на псионическую тренировку (или отменить ее). Помните, начальное обучение займет 30-60 дней.
 STR_NOT_ENOUGH_SPACE
 Not Enough Space!
 STR_WEAPONSELFDESTRUCTION
diff --git a/bin/data/Language/Spanish.lng b/bin/data/Language/Spanish.lng
@@ -2375,6 +2375,10 @@ STR_ALLOWPSIONICCAPTURE
 Permitir captura psiquica
 STR_ALLOWPSIONICCAPTURE_DESC
 Al controlar mentalmente a todos los alienigenas restantes la mision finaliza, y cuentan como capturados vivos.
+STR_ANYTIMEPSITRAINING
+Psionic training at any time
+STR_ANYTIMEPSITRAINING_DESC
+You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
 STR_NOT_ENOUGH_SPACE
 Not Enough Space!
 STR_WEAPONSELFDESTRUCTION
diff --git a/bin/data/Language/SpanishAL.lng b/bin/data/Language/SpanishAL.lng
@@ -2373,6 +2373,10 @@ STR_ALLOWPSIONICCAPTURE
 Permitir captura psíquica
 STR_ALLOWPSIONICCAPTURE_DESC
 Esta opción permite que al controlar mentalmente a todos los alienígena restantes, la misión finaliza automáticamente, y los alienígenas cuentan como las capturas vivas.
+STR_ANYTIMEPSITRAINING
+Psionic training at any time
+STR_ANYTIMEPSITRAINING_DESC
+You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
 STR_NOT_ENOUGH_SPACE
 Not Enough Space!
 STR_WEAPONSELFDESTRUCTION
diff --git a/bin/data/Language/Ukrainian.lng b/bin/data/Language/Ukrainian.lng
@@ -2375,6 +2375,10 @@ STR_ALLOWPSIONICCAPTURE
 Дозволити псі-захоплення
 STR_ALLOWPSIONICCAPTURE_DESC
 Псі-контроль над всіма прибульцями, що залишились, означає перемогу і вони рахуються як захоплені живими.
+STR_ANYTIMEPSITRAINING
+Psionic training at any time
+STR_ANYTIMEPSITRAINING_DESC
+You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
 STR_NOT_ENOUGH_SPACE
 Not Enough Space!
 STR_WEAPONSELFDESTRUCTION
diff --git a/src/Basescape/SoldierInfoState.cpp b/src/Basescape/SoldierInfoState.cpp
@@ -324,17 +324,7 @@ void SoldierInfoState::init()
 	UnitStats *initial = s->getInitStats();
 	UnitStats *current = s->getCurrentStats();
 	
-	if(s->getCurrentStats()->psiSkill == 0)
-	{
-		_txtPsiStrength->setVisible(false);
-		_numPsiStrength->setVisible(false);
-		_barPsiStrength->setVisible(false);
-
-		_txtPsiSkill->setVisible(false);
-		_numPsiSkill->setVisible(false);
-		_barPsiSkill->setVisible(false);
-	}
-	else
+	if(current->psiSkill > 0)
 	{
 		_txtPsiStrength->setVisible(true);
 		_numPsiStrength->setVisible(true);
@@ -344,6 +334,16 @@ void SoldierInfoState::init()
 		_numPsiSkill->setVisible(true);
 		_barPsiSkill->setVisible(true);
 	}
+	else
+	{
+		_txtPsiStrength->setVisible(false);
+		_numPsiStrength->setVisible(false);
+		_barPsiStrength->setVisible(false);
+
+		_txtPsiSkill->setVisible(false);
+		_numPsiSkill->setVisible(false);
+		_barPsiSkill->setVisible(false);
+	}
 	SurfaceSet *texture = _game->getResourcePack()->getSurfaceSet("BASEBITS.PCK");
 	texture->getFrame(s->getRankSprite())->setX(0);
 	texture->getFrame(s->getRankSprite())->setY(0);
@@ -439,7 +439,7 @@ void SoldierInfoState::init()
 	}
 
 	_txtPsionic->setVisible(s->isInPsiTraining());
-	
+
 	if(current->psiSkill > 0)
 	{
 		std::wstringstream ss14;
diff --git a/src/Basescape/SoldiersState.cpp b/src/Basescape/SoldiersState.cpp
@@ -23,6 +23,7 @@
 #include "../Engine/Language.h"
 #include "../Engine/Palette.h"
 #include "../Engine/Options.h"
+#include "../Geoscape/AllocatePsiTrainingState.h"
 #include "../Interface/TextButton.h"
 #include "../Interface/Window.h"
 #include "../Interface/Text.h"
@@ -43,9 +44,12 @@ namespace OpenXcom
  */
 SoldiersState::SoldiersState(Game *game, Base *base) : State(game), _base(base)
 {
+	bool isPsiBtnVisible = Options::getBool("anytimePsiTraining") && _base->getAvailablePsiLabs() > 0;
+
 	// Create objects
 	_window = new Window(this, 320, 200, 0, 0);
-	_btnOk = new TextButton(288, 16, 16, 176);
+	_btnOk = new TextButton(isPsiBtnVisible? 148:288, 16, isPsiBtnVisible? 164:16, 176);
+	_btnPsiTraining = new TextButton(148, 16, 8, 176);
 	_txtTitle = new Text(310, 16, 5, 8);
 	_txtName = new Text(114, 9, 16, 32);
 	_txtRank = new Text(102, 9, 130, 32);
@@ -57,6 +61,7 @@ SoldiersState::SoldiersState(Game *game, Base *base) : State(game), _base(base)
 
 	add(_window);
 	add(_btnOk);
+	add(_btnPsiTraining);
 	add(_txtTitle);
 	add(_txtName);
 	add(_txtRank);
@@ -72,6 +77,11 @@ SoldiersState::SoldiersState(Game *game, Base *base) : State(game), _base(base)
 	_btnOk->onMouseClick((ActionHandler)&SoldiersState::btnOkClick);
 	_btnOk->onKeyboardPress((ActionHandler)&SoldiersState::btnOkClick, (SDLKey)Options::getInt("keyCancel"));
 
+	_btnPsiTraining->setColor(Palette::blockOffset(13)+10);
+	_btnPsiTraining->setText(_game->getLanguage()->getString("STR_PSIONIC_TRAINING"));
+	_btnPsiTraining->onMouseClick((ActionHandler)&SoldiersState::btnPsiTrainingClick);
+	_btnPsiTraining->setVisible(isPsiBtnVisible);
+
 	_txtTitle->setColor(Palette::blockOffset(13)+10);
 	_txtTitle->setBig();
 	_txtTitle->setAlign(ALIGN_CENTER);
@@ -131,6 +141,15 @@ void SoldiersState::btnOkClick(Action *)
 	_game->popState();
 }
 
+/**
+ * Open Psionic Training screen.
+ * @param action Pointer to an action.
+ */
+void SoldiersState::btnPsiTrainingClick(Action *)
+{
+	_game->pushState(new AllocatePsiTrainingState(_game, _base));
+}
+
 /**
  * Shows the selected soldier's info.
  * @param action Pointer to an action.
diff --git a/src/Basescape/SoldiersState.h b/src/Basescape/SoldiersState.h
@@ -37,7 +37,7 @@ class Base;
 class SoldiersState : public State
 {
 private:
-	TextButton *_btnOk;
+	TextButton *_btnOk, *_btnPsiTraining;
 	Window *_window;
 	Text *_txtTitle, *_txtName, *_txtRank, *_txtCraft;
 	TextList *_lstSoldiers;
@@ -53,6 +53,8 @@ class SoldiersState : public State
 	void btnOkClick(Action *action);
 	/// Handler for clicking the Soldiers list.
 	void lstSoldiersClick(Action *action);
+	/// Handler for clicking the PsiTraining button.
+	void btnPsiTrainingClick(Action *action);
 };
 
 }
diff --git a/src/Battlescape/AggroBAIState.cpp b/src/Battlescape/AggroBAIState.cpp
@@ -355,7 +355,7 @@ void AggroBAIState::psiAction(BattleAction *action)
 		if ((*i)->getArmor()->getSize() == 1 && (*i)->getOriginalFaction() == FACTION_PLAYER && (*i)->getFaction() == FACTION_PLAYER)
 		{
 			int chanceToAttackMe = psiAttackStrength
-				+ ((*i)->getStats()->psiSkill * -0.4)
+				+ (((*i)->getStats()->psiSkill > 0) ? (*i)->getStats()->psiSkill * -0.4 : 0)
 				- (_game->getTileEngine()->distance(_unit->getPosition(), (*i)->getPosition()) / 2)
 				- ((*i)->getStats()->psiStrength)
 				+ (RNG::generate(0, 50))
diff --git a/src/Battlescape/TileEngine.cpp b/src/Battlescape/TileEngine.cpp
@@ -2246,7 +2246,8 @@ bool TileEngine::psiAttack(BattleAction *action)
 {
 	BattleUnit *victim = _save->getTile(action->target)->getUnit();
 	double attackStrength = static_cast<double>(action->actor->getStats()->psiStrength) * action->actor->getStats()->psiSkill / 50;
-	double defenseStrength = static_cast<double>(victim->getStats()->psiStrength) + 10.0 + (static_cast<double>(victim->getStats()->psiSkill) / 5);
+	double defenseStrength = static_cast<double>(victim->getStats()->psiStrength)
+		+ (victim->getStats()->psiSkill > 0) ? 10.0 + static_cast<double>(victim->getStats()->psiSkill) / 5 : 10.0;
 	int d = distance(action->actor->getPosition(), action->target);
 	attackStrength -= static_cast<double>(d)/2;
 	attackStrength += RNG::generate(0,55);
diff --git a/src/Engine/Options.cpp b/src/Engine/Options.cpp
@@ -66,6 +66,7 @@ void createDefault()
 	setBool("asyncBlit", true);
 	setInt("keyboardMode", KEYBOARD_ON);
 #endif
+	setBool("anytimePsiTraining", false);
 	setBool("playIntro", true);
 	setInt("maxFrameSkip", 8);
 	setBool("traceAI", false);
diff --git a/src/Geoscape/AllocatePsiTrainingState.cpp b/src/Geoscape/AllocatePsiTrainingState.cpp
@@ -122,13 +122,14 @@ AllocatePsiTrainingState::AllocatePsiTrainingState(Game *game, Base *base) : Sta
 	std::wstringstream ssStr;
 	std::wstringstream ssSkl;
 		_soldiers.push_back(*s);
-		ssSkl << (*s)->getCurrentStats()->psiSkill << "/+" << (*s)->getImprovement();
-		if((*s)->getCurrentStats()->psiSkill == 0)
+		if((*s)->getCurrentStats()->psiSkill <= 0)
 		{
+			ssSkl << "0/+0";
 			ssStr << _game->getLanguage()->getString("STR_UNKNOWN").c_str();
 		}
 		else
 		{
+			ssSkl << (*s)->getCurrentStats()->psiSkill << "/+" << (*s)->getImprovement();
 			ssStr << ((*s)->getCurrentStats()->psiStrength);
 		}
 		if((*s)->isInPsiTraining())
@@ -167,7 +168,6 @@ void AllocatePsiTrainingState::init()
 void AllocatePsiTrainingState::btnOkClick(Action *)
 {
 	_game->popState();
-	_game->pushState (new PsiTrainingState(_game));
 }
 
 void AllocatePsiTrainingState::lstSoldiersPress(Action *)
diff --git a/src/Geoscape/GeoscapeState.cpp b/src/Geoscape/GeoscapeState.cpp
@@ -1464,6 +1464,12 @@ void GeoscapeState::time1Day()
 				(*j)->heal();
 			}
 		}
+		// Handle psionic training
+		if ((*i)->getAvailablePsiLabs() > 0 && Options::getBool("anytimePsiTraining"))
+		{
+			for(std::vector<Soldier*>::const_iterator s = (*i)->getSoldiers()->begin(); s != (*i)->getSoldiers()->end(); ++s)
+				(*s)->trainPsi1Day();
+		}
 	}
 	// handle regional and country points for alien bases
 	for(std::vector<AlienBase*>::const_iterator b = _game->getSavedGame()->getAlienBases()->begin(); b != _game->getSavedGame()->getAlienBases()->end(); ++b)
@@ -1538,15 +1544,15 @@ void GeoscapeState::time1Month()
 				}
 			}
 		}
-		if (!psi && (*b)->getAvailablePsiLabs() > 0)
+		if (!psi && (*b)->getAvailablePsiLabs() > 0 && !Options::getBool("anytimePsiTraining"))
 		{
 			psi = true;
-		}
-		for(std::vector<Soldier*>::const_iterator s = (*b)->getSoldiers()->begin(); s != (*b)->getSoldiers()->end(); ++s)
-		{
-			if ((*s)->isInPsiTraining())
+			for(std::vector<Soldier*>::const_iterator s = (*b)->getSoldiers()->begin(); s != (*b)->getSoldiers()->end(); ++s)
 			{
-				(*s)->trainPsi();
+				if ((*s)->isInPsiTraining())
+				{
+					(*s)->trainPsi();
+				}
 			}
 		}
 	}
diff --git a/src/Geoscape/PsiTrainingState.cpp b/src/Geoscape/PsiTrainingState.cpp
diff --git a/src/Menu/AdvancedOptionsState.cpp b/src/Menu/AdvancedOptionsState.cpp
diff --git a/src/Savegame/Soldier.cpp b/src/Savegame/Soldier.cpp
diff --git a/src/Savegame/Soldier.h b/src/Savegame/Soldier.h
