Merge remote-tracking branch 'upstream/master' into loadout_copy_paste

Author: myk002

Run-Win32-Debug.bat

@@ -0,0 +1,2 @@
+@cd bin\Win32
+@start Debug\OpenXcom.exe -data "..\data"

Run-Win32-Release.bat

@@ -0,0 +1,2 @@
+@cd bin\Win32
+@start Release\OpenXcom.exe -data "..\data"

Run-Win64-Debug.bat

@@ -0,0 +1,2 @@
+@cd bin\Win32
+@start Debug\OpenXcom.exe -data "..\data"

Run-Win64-Release.bat

@@ -0,0 +1,2 @@
+@cd bin\Win64
+@start Release\OpenXcom.exe -data "..\data"

bin/data/Language/en-GB.yml

@@ -835,6 +835,7 @@ en-GB:
   STR_AMOUNT_AT_DESTINATION: "AMOUNT AT{NEWLINE}DESTINATION"
   STR_ALIEN_DIES_NO_ALIEN_CONTAINMENT_FACILITY: "Alien dies as there is no alien containment facility"
   STR_NO_FREE_ACCOMODATION_CREW: "NO FREE ACCOMMODATION!{SMALLLINE}The destination base does not have enough space in the living quarters for the crew assigned to the craft."
+  STR_NOT_ENOUGH_STORE_SPACE_FOR_CRAFT: "NOT ENOUGH STORE SPACE!{SMALLLINE}The destination base does not have enough store space for the equipment assigned to the craft."
   STR_ITEMS_ARRIVING: "Items Arriving"
   STR_DESTINATION_UC: "DESTINATION"
   STR_PISTOL: "Pistol"
@@ -1120,8 +1121,8 @@ en-GB:
   STR_ADVANCED: "ADVANCED"
   STR_AGGRESSIVERETALIATION: "Aggressive retaliation"
   STR_AGGRESSIVERETALIATION_DESC: "UFOs will attempt to detect your bases at all times, regardless of their mission parameters."
-  STR_ALIENCONTAINMENTLIMITENFORCED: "Alien containment limits"
-  STR_ALIENCONTAINMENTLIMITENFORCED_DESC: "Live alien containment limits will be imposed."
+  STR_STORAGELIMITSENFORCED: "Storage limits"
+  STR_STORAGELIMITSENFORCED_DESC: "Live alien containment and general stores limits will be imposed at all times."
   STR_CANSELLLIVEALIENS: "Live alien sale"
   STR_CANSELLLIVEALIENS_DESC: "Allows the sale of live aliens, recommended when using containment limits."
   STR_ALLOWAUTOSELLPRODUCTION: "Manufacture auto-sale"
@@ -1188,6 +1189,7 @@ en-GB:
   STR_DEAD_ALIENS: "Dead Aliens"
   STR_CONTAINMENT_EXCEEDED: "ALIEN CONTAINMENT LIMITS EXCEEDED!{SMALLLINE}Insufficient containment space at {0}. You must remove excess aliens from containment (who will then die)."
   STR_MANAGE_CONTAINMENT: "Manage Alien Containment"
+  STR_STORAGE_EXCEEDED: "STORAGE SPACE EXCEEDED!{SMALLLINE}Insufficient storage space at {0}. You must sell off excess items."
   STR_DETAILS: "DETAILS> {ALT}{0}"
   STR_GO_TO_BASE: "Go to Base"
   STR_DISABLEAUTOEQUIP: "Disable auto-equip"
@@ -1216,11 +1218,8 @@ en-GB:
   STR_ORIGINAL: "Original"
   STR_DISPLAY_MODE: "Display Mode"
   STR_WINDOWED: "Windowed"
-  STR_WINDOWED_DESC: "The game is displayed in a window."
   STR_FULLSCREEN: "Fullscreen"
-  STR_FULLSCREEN_DESC: "The game covers the whole screen."
   STR_BORDERLESS: "Borderless"
-  STR_BORDERLESS_DESC: "The game is displayed in a borderless window. If the display resolution is the same as the screen, it mimics fullscreen mode."
   STR_DISPLAY_LANGUAGE: "Display Language"
   STR_DISPLAY_LANGUAGE_DESC: "Changes the language of the in-game text."
   STR_DISPLAY_FILTER: "Display Filter"
@@ -1341,3 +1340,4 @@ en-GB:
   STR_AUTO_SAVE_GEOSCAPE_SLOT: "<AUTOSAVE GEOSCAPE>"
   STR_AUTO_SAVE_BATTLESCAPE_SLOT: "<AUTOSAVE BATTLESCAPE>"
   STR_QUICK_SAVE_SLOT: "<QUICKSAVE>"
+  STR_DISPLAY_MODE_DESC: "Change how the game is displayed on your screen."

bin/data/Language/en-US.yml

@@ -835,6 +835,7 @@ en-US:
   STR_AMOUNT_AT_DESTINATION: "AMOUNT AT{NEWLINE}DESTINATION"
   STR_ALIEN_DIES_NO_ALIEN_CONTAINMENT_FACILITY: "Alien dies as there is no alien containment facility"
   STR_NO_FREE_ACCOMODATION_CREW: "NO FREE ACCOMMODATION!{SMALLLINE}The destination base does not have enough space in the living quarters for the crew assigned to the craft."
+  STR_NOT_ENOUGH_STORE_SPACE_FOR_CRAFT: "NOT ENOUGH STORE SPACE!{SMALLLINE}The destination base does not have enough store space for the equipment assigned to the craft."
   STR_ITEMS_ARRIVING: "Items Arriving"
   STR_DESTINATION_UC: "DESTINATION"
   STR_PISTOL: "Pistol"
@@ -1120,8 +1121,8 @@ en-US:
   STR_ADVANCED: "ADVANCED"
   STR_AGGRESSIVERETALIATION: "Aggressive retaliation"
   STR_AGGRESSIVERETALIATION_DESC: "UFOs will attempt to detect your bases at all times, regardless of their mission parameters."
-  STR_ALIENCONTAINMENTLIMITENFORCED: "Alien containment limits"
-  STR_ALIENCONTAINMENTLIMITENFORCED_DESC: "Live alien containment limits will be imposed."
+  STR_STORAGELIMITSENFORCED: "Storage limits"
+  STR_STORAGELIMITSENFORCED_DESC: "Live alien containment and general stores limits will be imposed at all times."
   STR_CANSELLLIVEALIENS: "Live alien sale"
   STR_CANSELLLIVEALIENS_DESC: "Allows the sale of live aliens, recommended when using containment limits."
   STR_ALLOWAUTOSELLPRODUCTION: "Manufacture auto-sale"
@@ -1188,6 +1189,7 @@ en-US:
   STR_DEAD_ALIENS: "Dead Aliens"
   STR_CONTAINMENT_EXCEEDED: "ALIEN CONTAINMENT LIMITS EXCEEDED!{SMALLLINE}Insufficient containment space at {0}. You must remove excess aliens from containment (who will then die)."
   STR_MANAGE_CONTAINMENT: "Manage Alien Containment"
+  STR_STORAGE_EXCEEDED: "STORAGE SPACE EXCEEDED!{SMALLLINE}Insufficient storage space at {0}. You must sell off excess items."
   STR_DETAILS: "DETAILS> {ALT}{0}"
   STR_GO_TO_BASE: "Go to Base"
   STR_DISABLEAUTOEQUIP: "Disable auto-equip"
@@ -1216,11 +1218,8 @@ en-US:
   STR_ORIGINAL: "Original"
   STR_DISPLAY_MODE: "Display Mode"
   STR_WINDOWED: "Windowed"
-  STR_WINDOWED_DESC: "The game is displayed in a window."
   STR_FULLSCREEN: "Fullscreen"
-  STR_FULLSCREEN_DESC: "The game covers the whole screen."
   STR_BORDERLESS: "Borderless"
-  STR_BORDERLESS_DESC: "The game is displayed in a borderless window. If the display resolution is the same as the screen, it mimics fullscreen mode."
   STR_DISPLAY_LANGUAGE: "Display Language"
   STR_DISPLAY_LANGUAGE_DESC: "Changes the language of the in-game text."
   STR_DISPLAY_FILTER: "Display Filter"
@@ -1341,3 +1340,4 @@ en-US:
   STR_AUTO_SAVE_GEOSCAPE_SLOT: "<AUTOSAVE GEOSCAPE>"
   STR_AUTO_SAVE_BATTLESCAPE_SLOT: "<AUTOSAVE BATTLESCAPE>"
   STR_QUICK_SAVE_SLOT: "<QUICKSAVE>"
+  STR_DISPLAY_MODE_DESC: "Change how the game is displayed on your screen."

bin/data/Ruleset/Xcom1Ruleset.rul

@@ -1925,7 +1925,7 @@ items:
     battleType: 5
     blastRadius: 5
   - type: STR_HIGH_EXPLOSIVE
-    size: 0.25
+    size: 0.2
     costBuy: 1500
     costSell: 1200
     weight: 6
@@ -9253,6 +9253,8 @@ MCDPatches:
         bigWall: 4
       - MCDIndex: 33
         bigWall: 4
+      - MCDIndex: 39
+        LOFTS: [6,29,29,29,29,29,0,0,0,0,0,0]
       - MCDIndex: 43
         bigWall: 6
       - MCDIndex: 44

install/win/installer.nsi

@@ -97,6 +97,7 @@
 	!insertmacro MUI_LANGUAGE "PortugueseBR"
 	!insertmacro MUI_LANGUAGE "Polish"
 	!insertmacro MUI_LANGUAGE "Romanian"
+	!insertmacro MUI_LANGUAGE "Spanish"
 	!insertmacro MUI_LANGUAGE "Turkish"
 
 	!include "installerlang.nsh" ; Language strings

install/win/installerlang.nsh

@@ -289,4 +289,41 @@ LangString LINK_Uninstall ${LANG_TURKISH} "Program Kaldır"
 ;Warnings
 
 LangString WARN_UFOMissing ${LANG_TURKISH} "X-COM 1 bu dizinde bulunamadı. ${GAME_NAME} için geçerli bir X-COM kurulumu zorunludur. Devam?"
-LangString WARN_XCUDetected ${LANG_TURKISH} "XcomUtil tespit edildi. ${GAME_NAME} XcomUtil ile uyumlu olmadığından tuhaf sorunlarla karşılabilirsiniz. Devam?"
+LangString WARN_XCUDetected ${LANG_TURKISH} "XcomUtil tespit edildi. ${GAME_NAME} XcomUtil ile uyumlu olmadığından tuhaf sorunlarla karşılabilirsiniz. Devam?"
+
+;================SPANISH================
+
+;--------------------------------
+;Pages
+   
+LangString PAGE_UfoFolder ${LANG_SPANISH} "${GAME_NAME} requiere una copia de UFO: Enemy Unknown / X-COM: UFO Defense. Puede omitir este paso si va a actualizar una instalación existente.$\n$\nEl programa de instalación copiará los archivos necesarios en la siguiente carpeta. Para copiar desde una carpeta diferente, presione en Explorar y seleccione otra carpeta. Precione en Siguiente para continuar."
+LangString PAGE_UfoFolder_TITLE ${LANG_SPANISH} "Selecione ubicación X-COM 1 "
+LangString PAGE_UfoFolder_SUBTITLE ${LANG_SPANISH} "Selecione la carpeta donde tiene X-COM 1 instalado."
+LangString DEST_UfoFolder ${LANG_SPANISH} "X-COM 1 carpeta"
+;--------------------------------
+;Installer Sections
+   
+LangString NAME_SecMain ${LANG_SPANISH} "Archivos del juego"
+LangString DESC_SecMain ${LANG_SPANISH} "Archivos necesarios para ejecutar ${GAME_NAME}."
+LangString NAME_SecPatch ${LANG_SPANISH} "Parche de datos"
+LangString DESC_SecPatch ${LANG_SPANISH} "Corrige los errores en los datos de X-COM 1. Recomendado para instalaciones iniciales. (requiere una conexión al Internet)"
+LangString NAME_SecDesktop ${LANG_SPANISH} "Atajo en el escritorio"
+LangString DESC_SecDesktop ${LANG_SPANISH} "Crea un acceso directo en el escritorio para jugar ${GAME_NAME}."
+   
+;--------------------------------
+;Uninstaller Descriptions
+LangString NAME_UnData ${LANG_SPANISH} "Borra datos de X-COM"
+LangString DESC_UnData ${LANG_SPANISH} "Borra todos los datos de ${GAME_NAME}, incluyendo mods y los recursos de X-COM. Recomendado para una reinstalación limpia."
+LangString NAME_UnUser ${LANG_SPANISH} "Borra datos de usuario"
+LangString DESC_UnUser ${LANG_SPANISH} "Borra todos los datos del usuario ${GAME_NAME}, incluyendo partidas guardadas, capturas de pantalla y opciones. Recomendado para una limpieza completa. "
+;--------------------------------
+;Shortcuts
+LangString LINK_DataFolder ${LANG_SPANISH} "Carpeta de datos"
+LangString LINK_Readme ${LANG_SPANISH} "Leerme"
+LangString LINK_UserFolder ${LANG_SPANISH} "Carpeta de usuario"
+LangString LINK_Uninstall ${LANG_SPANISH} "Desinstalación"
+   
+;--------------------------------
+;Warnings
+LangString WARN_UFOMissing ${LANG_SPANISH} "X-COM 1 no se encuentra en esta carpeta. ${GAME_NAME} requiere una instalación válida de X-COM para ejecutarse. ¿Desea continuar?"
+LangString WARN_XCUDetected ${LANG_SPANISH} "XcomUtil detectado. ${GAME_NAME} es incompatible con XcomUtil y puede experimentar un comportamiento extraño. ¿Desea continuar?"

src/Basescape/BaseInfoState.cpp

@@ -81,25 +81,25 @@ BaseInfoState::BaseInfoState(Game *game, Base *base, BasescapeState *state) : St
 	_txtWorkshops = new Text(114, 9, 8, 113);
 	_numWorkshops = new Text(40, 9, 126, 113);
 	_barWorkshops = new Bar(150, 5, 166, 115);
-	if (Options::alienContainmentLimitEnforced)
+	if (Options::storageLimitsEnforced)
 	{
 		_txtContainment = new Text(114, 9, 8, 123);
 		_numContainment = new Text(40, 9, 126, 123);
 		_barContainment = new Bar(150, 5, 166, 125);
 	}
-	_txtHangars = new Text(114, 9, 8, Options::alienContainmentLimitEnforced ? 133 : 123);
-	_numHangars = new Text(40, 9, 126, Options::alienContainmentLimitEnforced ? 133 : 123);
-	_barHangars = new Bar(150, 5, 166, Options::alienContainmentLimitEnforced ? 135 : 125);
-
-	_txtDefense = new Text(114, 9, 8, Options::alienContainmentLimitEnforced ? 147 : 138);
-	_numDefense = new Text(40, 9, 126, Options::alienContainmentLimitEnforced ? 147 : 138);
-	_barDefense = new Bar(150, 5, 166, Options::alienContainmentLimitEnforced ? 149 : 140);
-	_txtShortRange = new Text(114, 9, 8, Options::alienContainmentLimitEnforced ? 157 : 153);
-	_numShortRange = new Text(40, 9, 126, Options::alienContainmentLimitEnforced ? 157 : 153);
-	_barShortRange = new Bar(150, 5, 166, Options::alienContainmentLimitEnforced ? 159 : 155);
-	_txtLongRange = new Text(114, 9, 8, Options::alienContainmentLimitEnforced ? 167 : 163);
-	_numLongRange = new Text(40, 9, 126, Options::alienContainmentLimitEnforced ? 167 : 163);
-	_barLongRange = new Bar(150, 5, 166, Options::alienContainmentLimitEnforced ? 169 : 165);
+	_txtHangars = new Text(114, 9, 8, Options::storageLimitsEnforced ? 133 : 123);
+	_numHangars = new Text(40, 9, 126, Options::storageLimitsEnforced ? 133 : 123);
+	_barHangars = new Bar(150, 5, 166, Options::storageLimitsEnforced ? 135 : 125);
+
+	_txtDefense = new Text(114, 9, 8, Options::storageLimitsEnforced ? 147 : 138);
+	_numDefense = new Text(40, 9, 126, Options::storageLimitsEnforced ? 147 : 138);
+	_barDefense = new Bar(150, 5, 166, Options::storageLimitsEnforced ? 149 : 140);
+	_txtShortRange = new Text(114, 9, 8, Options::storageLimitsEnforced ? 157 : 153);
+	_numShortRange = new Text(40, 9, 126, Options::storageLimitsEnforced ? 157 : 153);
+	_barShortRange = new Bar(150, 5, 166, Options::storageLimitsEnforced ? 159 : 155);
+	_txtLongRange = new Text(114, 9, 8, Options::storageLimitsEnforced ? 167 : 163);
+	_numLongRange = new Text(40, 9, 126, Options::storageLimitsEnforced ? 167 : 163);
+	_barLongRange = new Bar(150, 5, 166, Options::storageLimitsEnforced ? 169 : 165);
 
 	// Set palette
 	setPalette("PAL_BASESCAPE");
@@ -136,7 +136,7 @@ BaseInfoState::BaseInfoState(Game *game, Base *base, BasescapeState *state) : St
 	add(_txtWorkshops);
 	add(_numWorkshops);
 	add(_barWorkshops);
-	if (Options::alienContainmentLimitEnforced)
+	if (Options::storageLimitsEnforced)
 	{
 		add(_txtContainment);
 		add(_numContainment);
@@ -160,7 +160,7 @@ BaseInfoState::BaseInfoState(Game *game, Base *base, BasescapeState *state) : St
 
 	// Set up objects
 	std::ostringstream ss;
-	if (Options::alienContainmentLimitEnforced)
+	if (Options::storageLimitsEnforced)
 	{
 		ss << "ALT";
 	}
@@ -263,7 +263,7 @@ BaseInfoState::BaseInfoState(Game *game, Base *base, BasescapeState *state) : St
 	_barWorkshops->setColor(Palette::blockOffset(3));
 	_barWorkshops->setScale(0.5);
 
-	if (Options::alienContainmentLimitEnforced)
+	if (Options::storageLimitsEnforced)
 	{
 		_txtContainment->setColor(Palette::blockOffset(13)+5);
 		_txtContainment->setText(tr("STR_ALIEN_CONTAINMENT"));
@@ -354,11 +354,11 @@ void BaseInfoState::init()
 	_barQuarters->setValue(_base->getUsedQuarters());
 
 	std::wostringstream ss5;
-	ss5 << _base->getUsedStores() << ":" << _base->getAvailableStores();
+	ss5 << (int)floor(_base->getUsedStores() + 0.05) << ":" << _base->getAvailableStores();
 	_numStores->setText(ss5.str());
 
 	_barStores->setMax(_base->getAvailableStores());
-	_barStores->setValue(_base->getUsedStores());
+	_barStores->setValue((int)floor(_base->getUsedStores() + 0.05));
 
 	std::wostringstream ss6;
 	ss6 << _base->getUsedLaboratories() << ":" << _base->getAvailableLaboratories();
@@ -374,7 +374,7 @@ void BaseInfoState::init()
 	_barWorkshops->setMax(_base->getAvailableWorkshops());
 	_barWorkshops->setValue(_base->getUsedWorkshops());
 
-	if (Options::alienContainmentLimitEnforced)
+	if (Options::storageLimitsEnforced)
 	{
 		std::wostringstream ss72;
 		ss72 << _base->getUsedContainment() << ":" << _base->getAvailableContainment();