diff --git a/bin/data/Language/Bulgarian.lng b/bin/data/Language/Bulgarian.lng index c62b6cb46b..46c8a45edb 100644 --- a/bin/data/Language/Bulgarian.lng +++ b/bin/data/Language/Bulgarian.lng @@ -2293,9 +2293,9 @@ STR_AGGRESSIVERETALIATION Aggressive retaliation STR_AGGRESSIVERETALIATION_DESC UFOs will attempt to detect your bases at all times, regardless of their mission parameters. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Alien containment limits -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Live alien containment limits will be imposed. STR_CANSELLLIVEALIENS Live alien sale @@ -2395,10 +2395,6 @@ STR_WEAPONSELFDESTRUCTION XCom 2012 item recovery STR_WEAPONSELFDESTRUCTION_DESC Weapons carried by aliens will self destruct if their owner is killed. -STR_ALIENRESEARCHUSESCONTAINMENT -Alien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Aliens use containment facility while in research, closing the "infinite live aliens" exploit. STR_ARROWS ARROWS STR_FULL diff --git a/bin/data/Language/Czech.lng b/bin/data/Language/Czech.lng index 0890427e68..6e9daf8725 100644 --- a/bin/data/Language/Czech.lng +++ b/bin/data/Language/Czech.lng @@ -2300,9 +2300,9 @@ STR_AGGRESSIVERETALIATION Agresivní odplata STR_AGGRESSIVERETALIATION_DESC UFA se vždy pokusí najít vaši základny bez ohledu na jejich primární misi. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Omezená velikost cizáckých cel -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Cizácké cely budou mít omezenou velikost. STR_CANSELLLIVEALIENS Prodej živých cizáků @@ -2402,10 +2402,6 @@ STR_WEAPONSELFDESTRUCTION Sebedestrukce cizáckých zbraní (XCom 2012) STR_WEAPONSELFDESTRUCTION_DESC Zbraně cizáků se po jejich smrti automaticky zničí stejně jako v XCom 2012. -STR_ALIENRESEARCHUSESCONTAINMENT -Alien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Aliens use containment facility while in research, closing the "infinite live aliens" exploit STR_ARROWS ARROWS STR_FULL diff --git a/bin/data/Language/Danish.lng b/bin/data/Language/Danish.lng index de964aa180..87bea66479 100644 --- a/bin/data/Language/Danish.lng +++ b/bin/data/Language/Danish.lng @@ -2293,9 +2293,9 @@ STR_AGGRESSIVERETALIATION Aggressive retaliation STR_AGGRESSIVERETALIATION_DESC UFOs will attempt to detect your bases at all times, regardless of their mission parameters. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Alien containment limits -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Live alien containment limits will be imposed. STR_CANSELLLIVEALIENS Live alien sale @@ -2391,10 +2391,6 @@ STR_WEAPONSELFDESTRUCTION XCom 2012 item recovery STR_WEAPONSELFDESTRUCTION_DESC Weapons carried by aliens will self destruct if their owner is killed. -STR_ALIENRESEARCHUSESCONTAINMENT -Alien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Aliens use containment facility while in research, closing the "infinite live aliens" exploit. STR_ARROWS ARROWS STR_FULL diff --git a/bin/data/Language/English.lng b/bin/data/Language/English.lng index 481f3beb67..b2bceab6a9 100644 --- a/bin/data/Language/English.lng +++ b/bin/data/Language/English.lng @@ -2297,9 +2297,9 @@ STR_AGGRESSIVERETALIATION Aggressive retaliation STR_AGGRESSIVERETALIATION_DESC UFOs will attempt to detect your bases at all times, regardless of their mission parameters. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Alien containment limits -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Live alien containment limits will be imposed. STR_CANSELLLIVEALIENS Live alien sale @@ -2399,10 +2399,6 @@ STR_WEAPONSELFDESTRUCTION XCom 2012 item recovery STR_WEAPONSELFDESTRUCTION_DESC Weapons carried by aliens will self destruct if their owner is killed. -STR_ALIENRESEARCHUSESCONTAINMENT -Alien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Aliens use containment facility while in research, closing the "infinite live aliens" exploit. STR_ARROWS ARROWS STR_FULL diff --git a/bin/data/Language/EnglishUk.lng b/bin/data/Language/EnglishUk.lng index 2f839381ea..7733340577 100644 --- a/bin/data/Language/EnglishUk.lng +++ b/bin/data/Language/EnglishUk.lng @@ -2297,9 +2297,9 @@ STR_AGGRESSIVERETALIATION Aggressive retaliation STR_AGGRESSIVERETALIATION_DESC UFOs will attempt to detect your bases at all times, regardless of their mission parameters. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Alien containment limits -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Live alien containment limits will be imposed. STR_CANSELLLIVEALIENS Live alien sale @@ -2399,10 +2399,6 @@ STR_WEAPONSELFDESTRUCTION XCom 2012 item recovery STR_WEAPONSELFDESTRUCTION_DESC Weapons carried by aliens will self destruct if their owner is killed. -STR_ALIENRESEARCHUSESCONTAINMENT -Alien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Aliens use containment facility while in research, closing the "infinite live aliens" exploit. STR_ARROWS ARROWS STR_FULL diff --git a/bin/data/Language/French.lng b/bin/data/Language/French.lng index 4b09912f92..663dd2bb41 100644 --- a/bin/data/Language/French.lng +++ b/bin/data/Language/French.lng @@ -2293,9 +2293,9 @@ STR_AGGRESSIVERETALIATION Représaille agressive STR_AGGRESSIVERETALIATION_DESC Tous les OVNIs tente de détécter les bases X-Com quelque soit les paramètres de mission. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Limite pour la détention des E.T. -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Le nombre d'aliens détenu est limité par installation. STR_CANSELLLIVEALIENS Vente des E.T. vivants @@ -2395,10 +2395,6 @@ STR_WEAPONSELFDESTRUCTION XCom 2012 item recovery STR_WEAPONSELFDESTRUCTION_DESC Weapons carried by aliens will self destruct if their owner is killed. -STR_ALIENRESEARCHUSESCONTAINMENT -Alien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Aliens use containment facility while in research, closing the "infinite live aliens" exploit. STR_ARROWS ARROWS STR_FULL diff --git a/bin/data/Language/German.lng b/bin/data/Language/German.lng index a77e14ae5a..e01598eb89 100644 --- a/bin/data/Language/German.lng +++ b/bin/data/Language/German.lng @@ -2293,9 +2293,9 @@ STR_AGGRESSIVERETALIATION Agressive Vergeltung STR_AGGRESSIVERETALIATION_DESC UFOs können jederzeit Ihre Basen aufspüren, unabhängig ihrer Missionsparameter. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Limit lebendig gefangener Aliens -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Die Anzahl der Aliens, die in den Ausserirdischen-Klimazellen gefangen gehalten werden können, ist beschränkt. STR_CANSELLLIVEALIENS Verkauf lebender Aliens @@ -2395,10 +2395,6 @@ STR_WEAPONSELFDESTRUCTION XCom 2012 item recovery STR_WEAPONSELFDESTRUCTION_DESC Weapons carried by aliens will self destruct if their owner is killed. -STR_ALIENRESEARCHUSESCONTAINMENT -Alien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Aliens use containment facility while in research, closing the "infinite live aliens" exploit. STR_ARROWS ARROWS STR_FULL diff --git a/bin/data/Language/Hungarian.lng b/bin/data/Language/Hungarian.lng index b9f6e67ddd..1119ca9c19 100644 --- a/bin/data/Language/Hungarian.lng +++ b/bin/data/Language/Hungarian.lng @@ -2291,9 +2291,9 @@ STR_AGGRESSIVERETALIATION Aggresszív megtorlás STR_AGGRESSIVERETALIATION_DESC Az UFO-k - küldetésüktől függetlenül - minden alkalommal kíserletet tesznek a bázisod helyének kiderítésére. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Idegen Tároló felső korlátossága -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Az Idegen Tároló csak meghatározott számú élő idegent képes tárolni. (alap: 10) STR_CANSELLLIVEALIENS Élő idegen eladhatósága @@ -2393,10 +2393,6 @@ STR_WEAPONSELFDESTRUCTION XCom 2012 item recovery STR_WEAPONSELFDESTRUCTION_DESC Weapons carried by aliens will self destruct if their owner is killed. -STR_ALIENRESEARCHUSESCONTAINMENT -Alien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Aliens use containment facility while in research, closing the "infinite live aliens" exploit. STR_ARROWS ARROWS STR_FULL diff --git a/bin/data/Language/Italian.lng b/bin/data/Language/Italian.lng index 639b793f3d..8f5570e0ae 100644 --- a/bin/data/Language/Italian.lng +++ b/bin/data/Language/Italian.lng @@ -2297,9 +2297,9 @@ STR_AGGRESSIVERETALIATION Rappresaglia aggressiva STR_AGGRESSIVERETALIATION_DESC Gli UFO cercheranno di individuare le tue basi in ogni momento, a prescindere dai loro parametri di missione. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Limiti di contenimento alieni -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Saranno imposti limiti di contenimento alieni vivi. STR_CANSELLLIVEALIENS Vendita alieni vivi @@ -2399,10 +2399,6 @@ STR_WEAPONSELFDESTRUCTION XCom 2012 item recovery STR_WEAPONSELFDESTRUCTION_DESC Weapons carried by aliens will self destruct if their owner is killed. -STR_ALIENRESEARCHUSESCONTAINMENT -Alien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Aliens use containment facility while in research, closing the "infinite live aliens" exploit. STR_ARROWS ARROWS STR_FULL diff --git a/bin/data/Language/Polish.lng b/bin/data/Language/Polish.lng index eac65ac7ad..3dec1076b7 100644 --- a/bin/data/Language/Polish.lng +++ b/bin/data/Language/Polish.lng @@ -2303,9 +2303,9 @@ STR_AGGRESSIVERETALIATION Agresywne akcje odwetowe STR_AGGRESSIVERETALIATION_DESC UFO zawsze będzie próbowało wykryć Twoje bazy, bez względu na cel swojej misji. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Limity cel dla obcych -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Limit ilości miejsca w celach dla żywych obcych. STR_CANSELLLIVEALIENS Sprzedaż żywych obcych @@ -2405,10 +2405,6 @@ STR_WEAPONSELFDESTRUCTION Odzyskiwanie wyposażenia jak w XCom 2012 STR_WEAPONSELFDESTRUCTION_DESC Broń używana przez kosmitów ulegnie samozniszczeniu, jeśli jej właściciel zostanie zabity. -STR_ALIENRESEARCHUSESCONTAINMENT -Badania nad obcym wymagają cel -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Podczas przeprowadzania badań nad obcymi, zajmują oni przestrzeń w celach. Wyklucza to możliwość przetrzymywania nieskończonej ilości żywych obcych. STR_ARROWS STRZAŁKI STR_FULL diff --git a/bin/data/Language/Portuguese.lng b/bin/data/Language/Portuguese.lng index 9438eec3eb..d2ec0d0a6d 100644 --- a/bin/data/Language/Portuguese.lng +++ b/bin/data/Language/Portuguese.lng @@ -2297,9 +2297,9 @@ STR_AGGRESSIVERETALIATION Retaliação Agressiva STR_AGGRESSIVERETALIATION_DESC Todos os OVNIs tentarão detetar bases XCom, independentemente das suas diretivas. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Contenção Alienígena limitada -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Limita o número de alienígenas em contenção. Recomenda-se o uso da opção "Vender alienígenas vivos". STR_CANSELLLIVEALIENS Vender alienígenas vivos @@ -2399,10 +2399,6 @@ STR_WEAPONSELFDESTRUCTION XCom 2012 item recovery STR_WEAPONSELFDESTRUCTION_DESC Weapons carried by aliens will self destruct if their owner is killed. -STR_ALIENRESEARCHUSESCONTAINMENT -Alien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Aliens use containment facility while in research, closing the "infinite live aliens" exploit. STR_ARROWS ARROWS STR_FULL diff --git a/bin/data/Language/Romanian.lng b/bin/data/Language/Romanian.lng index b3d9cc8660..fb779c5f12 100644 --- a/bin/data/Language/Romanian.lng +++ b/bin/data/Language/Romanian.lng @@ -2297,9 +2297,9 @@ STR_AGGRESSIVERETALIATION Represalii agresive STR_AGGRESSIVERETALIATION_DESC OZNurile vor încerca să îți detecteze bazele întotdeauna, indiferent de parametrii misiunii lor. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Limite carantină extratereștrii -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Vor fi impuse limite pentru numărul de extratereștrii vii din carantină. STR_CANSELLLIVEALIENS Vânzarea extratereștrilor vii @@ -2399,10 +2399,6 @@ STR_WEAPONSELFDESTRUCTION Recuperare articole tip XCom 2012 STR_WEAPONSELFDESTRUCTION_DESC Armele cărate de extratereștrii se autodistrug dacă posesorul este omorât. -STR_ALIENRESEARCHUSESCONTAINMENT -Alien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Aliens use containment facility while in research, closing the "infinite live aliens" exploit. STR_ARROWS SĂGEȚI STR_FULL diff --git a/bin/data/Language/Russian.lng b/bin/data/Language/Russian.lng index eb703ba1e8..2187284650 100644 --- a/bin/data/Language/Russian.lng +++ b/bin/data/Language/Russian.lng @@ -2299,9 +2299,9 @@ STR_AGGRESSIVERETALIATION Агрессивное возмездие STR_AGGRESSIVERETALIATION_DESC НЛО будут постоянно пытаться обнаружить вашу базу, вне зависимости от их типов миссий. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Ограничение содержания пришельцев -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Количество живых пришельцев в тюрьмах ограничено. STR_CANSELLLIVEALIENS Продажа живых пришельцев @@ -2401,10 +2401,6 @@ STR_WEAPONSELFDESTRUCTION XCom 2012 item recovery STR_WEAPONSELFDESTRUCTION_DESC Weapons carried by aliens will self destruct if their owner is killed. -STR_ALIENRESEARCHUSESCONTAINMENT -Alien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Aliens use containment facility while in research, closing the "infinite live aliens" exploit. STR_ARROWS ARROWS STR_FULL diff --git a/bin/data/Language/Spanish.lng b/bin/data/Language/Spanish.lng index 88616e223a..8bce8a9f19 100644 --- a/bin/data/Language/Spanish.lng +++ b/bin/data/Language/Spanish.lng @@ -2297,9 +2297,9 @@ STR_AGGRESSIVERETALIATION Represalia Agresiva STR_AGGRESSIVERETALIATION_DESC Los OVNIs intentarán detectar tus bases siempre, independientemente de sus parametros de misión. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Límites de contención alienígena -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Se impondrán límites a la contención de alienígenas. STR_CANSELLLIVEALIENS Venta de alienígenas vivos @@ -2399,10 +2399,6 @@ STR_WEAPONSELFDESTRUCTION XCom 2012 item recovery STR_WEAPONSELFDESTRUCTION_DESC Weapons carried by aliens will self destruct if their owner is killed. -STR_ALIENRESEARCHUSESCONTAINMENT -Alien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Aliens use containment facility while in research, closing the "infinite live aliens" exploit. STR_ARROWS ARROWS STR_FULL diff --git a/bin/data/Language/SpanishAL.lng b/bin/data/Language/SpanishAL.lng index b2774117ad..e966c030ad 100644 --- a/bin/data/Language/SpanishAL.lng +++ b/bin/data/Language/SpanishAL.lng @@ -2293,9 +2293,9 @@ STR_AGGRESSIVERETALIATION Represalias agresivas STR_AGGRESSIVERETALIATION_DESC Esta opción permite que los OVNIs intenten detectar sus bases en todo momento, independiente de los parámetros de la misión alienígena. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Limite del confinamiento alienígena -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Esta opción permite imponer límites en la cantidad de alienígenas vivos permitidos en el confinamiento. STR_CANSELLLIVEALIENS Venta de alienígenas vivos @@ -2395,10 +2395,6 @@ STR_WEAPONSELFDESTRUCTION XCom 2012 item recovery STR_WEAPONSELFDESTRUCTION_DESC Weapons carried by aliens will self destruct if their owner is killed. -STR_ALIENRESEARCHUSESCONTAINMENT -Alien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Aliens use containment facility while in research, closing the "infinite live aliens" exploit. STR_ARROWS ARROWS STR_FULL diff --git a/bin/data/Language/Ukrainian.lng b/bin/data/Language/Ukrainian.lng index 60ffe06430..58f1d690bb 100644 --- a/bin/data/Language/Ukrainian.lng +++ b/bin/data/Language/Ukrainian.lng @@ -2297,9 +2297,9 @@ STR_AGGRESSIVERETALIATION Агресивна відплата STR_AGGRESSIVERETALIATION_DESC НЛО завжди будуть намагатись знайти Вашу базу, незалежно від виконуваного завдання. -STR_ALIENCONTAINMENTHASUPPERLIMIT +STR_ALIENCONTAINMENTLIMITENFORCED Ліміт тюрми для прибульців -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC +STR_ALIENCONTAINMENTLIMITENFORCED_DESC Буде введено ліміт на кількість живих прибульців в тюрмах. STR_CANSELLLIVEALIENS Продаж живих прибульців @@ -2399,10 +2399,6 @@ STR_WEAPONSELFDESTRUCTION Захоплення зброї як в XCOM 2012 STR_WEAPONSELFDESTRUCTION_DESC Зброя прибульців буде самознищуватись, якщо її власник буде вбитий. -STR_ALIENRESEARCHUSESCONTAINMENT -Alien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESC -Aliens use containment facility while in research, closing the "infinite live aliens" exploit. STR_ARROWS СТРІЛКИ STR_FULL diff --git a/docs/language_id.html b/docs/language_id.html index 02df2f48ed..13cace674b 100644 --- a/docs/language_id.html +++ b/docs/language_id.html @@ -43,10 +43,8 @@ STR_AIMEDAimed STR_AIMED_SHOTAimed Shot STR_ALIENAlien -STR_ALIENCONTAINMENTHASUPPERLIMITAlien containment limits -STR_ALIENCONTAINMENTHASUPPERLIMIT_DESCLive alien containment limits will be imposed. -STR_ALIENRESEARCHUSESCONTAINMENTAlien research requires containment -STR_ALIENRESEARCHUSESCONTAINMENT_DESCAliens use containment facility while in research, closing the "infinite live aliens" exploit. +STR_ALIENCONTAINMENTLIMITENFORCEDAlien containment limits are enforced +STR_ALIENCONTAINMENTLIMITENFORCED_DESCLive alien containment limits will be imposed. STR_ALIENSAliens STR_ALIENS_DEFEATEDAliens defeated STR_ALIENS_KILLEDALIENS KILLED diff --git a/src/Basescape/BaseInfoState.cpp b/src/Basescape/BaseInfoState.cpp index b11c5ed15c..16db06bce9 100644 --- a/src/Basescape/BaseInfoState.cpp +++ b/src/Basescape/BaseInfoState.cpp @@ -48,7 +48,7 @@ namespace OpenXcom */ BaseInfoState::BaseInfoState(Game *game, Base *base, BasescapeState *state) : State(game), _base(base), _state(state) { - _containmentLimit = Options::getBool("alienContainmentHasUpperLimit"); + _containmentLimit = Options::getBool("alienContainmentLimitEnforced"); // Create objects _bg = new Surface(320, 200, 0, 0); _mini = new MiniBaseView(128, 16, 182, 8); diff --git a/src/Basescape/ResearchInfoState.cpp b/src/Basescape/ResearchInfoState.cpp index f51cc1e82f..40c2313c23 100644 --- a/src/Basescape/ResearchInfoState.cpp +++ b/src/Basescape/ResearchInfoState.cpp @@ -32,7 +32,6 @@ #include "../Ruleset/Ruleset.h" #include "../Savegame/ItemContainer.h" #include "../Savegame/ResearchProject.h" -#include "../Menu/ErrorMessageState.h" #include "ResearchState.h" #include "NewResearchListState.h" #include "../Interface/ArrowButton.h" @@ -202,13 +201,6 @@ void ResearchInfoState::btnCancelClick(Action *) const RuleResearch *ruleResearch = _rule ? _rule : _project->getRules(); if (ruleResearch->needItem() &&_game->getRuleset()->getUnit(ruleResearch->getName())) { - // !_rule since we should always be able to cancel if the project hasn't been started yet - if (!_rule && Options::getBool("alienContainmentHasUpperLimit") && !Options::getBool("alienResearchUsesContainment") - && _base->getAvailableContainment() <= _base->getUsedContainment()) - { - _game->pushState(new ErrorMessageState(_game, "STR_NO_ALIEN_CONTAINMENT_FOR_TRANSFER", Palette::blockOffset(15)+1, "BACK13.SCR", 0)); - return; - } _base->getItems()->addItem(ruleResearch->getName(), 1); } _base->removeResearch(_project); diff --git a/src/Basescape/TransferItemsState.cpp b/src/Basescape/TransferItemsState.cpp index 819565f5a2..73cb64f9ba 100644 --- a/src/Basescape/TransferItemsState.cpp +++ b/src/Basescape/TransferItemsState.cpp @@ -58,7 +58,7 @@ TransferItemsState::TransferItemsState(Game *game, Base *baseFrom, Base *baseTo) { _changeValueByMouseWheel = Options::getInt("changeValueByMouseWheel"); _allowChangeListValuesByMouseWheel = (Options::getBool("allowChangeListValuesByMouseWheel") && _changeValueByMouseWheel); - _containmentLimit = Options::getBool("alienContainmentHasUpperLimit"); + _containmentLimit = Options::getBool("alienContainmentLimitEnforced"); _canTransferCraftsWhileAirborne = Options::getBool("canTransferCraftsWhileAirborne"); // Create objects diff --git a/src/Battlescape/DebriefingState.cpp b/src/Battlescape/DebriefingState.cpp index 38b642dd71..22d935fc43 100644 --- a/src/Battlescape/DebriefingState.cpp +++ b/src/Battlescape/DebriefingState.cpp @@ -66,7 +66,7 @@ DebriefingState::DebriefingState(Game *game) : State(game), _region(0), _country { // Restore the cursor in case something weird happened _game->getCursor()->setVisible(true); - _containmentLimit = Options::getBool("alienContainmentHasUpperLimit") ? 1 : 0; + _containmentLimit = Options::getBool("alienContainmentLimitEnforced") ? 1 : 0; // Create objects _window = new Window(this, 320, 200, 0, 0); _btnOk = new TextButton(40, 12, 16, 180); diff --git a/src/Engine/Options.cpp b/src/Engine/Options.cpp index 040cd7350f..b15d6ce279 100755 --- a/src/Engine/Options.cpp +++ b/src/Engine/Options.cpp @@ -110,7 +110,7 @@ void createDefault() setInt("audioSampleRate", 22050); setInt("audioBitDepth", 16); setInt("pauseMode", 0); - setBool("alienContainmentHasUpperLimit", false); + setBool("alienContainmentLimitEnforced", false); setBool("canSellLiveAliens", false); setBool("canTransferCraftsWhileAirborne", false); // When the craft can reach the destination base with its fuel setBool("canManufactureMoreItemsPerHour", false); @@ -128,7 +128,6 @@ void createDefault() setBool("battleAutoEnd", false); setBool("allowPsionicCapture", false); setBool("borderless", false); - setBool("alienResearchUsesContainment", false); // new battle mode data setInt("NewBattleMission", 0); diff --git a/src/Menu/AdvancedOptionsState.cpp b/src/Menu/AdvancedOptionsState.cpp index 3575ffcf86..b2b3d38db7 100644 --- a/src/Menu/AdvancedOptionsState.cpp +++ b/src/Menu/AdvancedOptionsState.cpp @@ -92,7 +92,7 @@ AdvancedOptionsState::AdvancedOptionsState(Game *game) : State(game) _lstOptions->setColor(Palette::blockOffset(8)+5); _settingBoolSet.push_back(std::pair("aggressiveRetaliation", false)); - _settingBoolSet.push_back(std::pair("alienContainmentHasUpperLimit", false)); + _settingBoolSet.push_back(std::pair("alienContainmentLimitEnforced", false)); _settingBoolSet.push_back(std::pair("canSellLiveAliens", false)); _settingBoolSet.push_back(std::pair("allowAutoSellProduction", false)); _settingBoolSet.push_back(std::pair("allowBuildingQueue", false)); @@ -114,7 +114,6 @@ AdvancedOptionsState::AdvancedOptionsState(Game *game) : State(game) _settingBoolSet.push_back(std::pair("battleScrollDragInvert", false)); _settingBoolSet.push_back(std::pair("allowPsionicCapture", false)); _settingBoolSet.push_back(std::pair("anytimePsiTraining", false)); - _settingBoolSet.push_back(std::pair("alienResearchUsesContainment", false)); _boolQuantity = _settingBoolSet.size(); int sel = 0; diff --git a/src/Savegame/Base.cpp b/src/Savegame/Base.cpp index ec428e15b3..68ed1bbcf1 100644 --- a/src/Savegame/Base.cpp +++ b/src/Savegame/Base.cpp @@ -1044,7 +1044,7 @@ int Base::getUsedContainment() const } } } - if (Options::getBool("alienResearchUsesContainment")) + if (Options::getBool("alienContainmentLimitEnforced")) { for (std::vector::const_iterator i = _research.begin(); i != _research.end(); ++i) {