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

Author: myk002

Makefile.am

@@ -403,6 +403,8 @@ openxcom_SOURCES = \
 	src/Interface/ArrowButton.h \
 	src/Interface/Bar.cpp \
 	src/Interface/Bar.h \
+	src/Interface/ComboBox.cpp \
+	src/Interface/ComboBox.h \
 	src/Interface/Cursor.cpp \
 	src/Interface/Cursor.h \
 	src/Interface/FpsCounter.cpp \
@@ -413,6 +415,8 @@ openxcom_SOURCES = \
 	src/Interface/ImageButton.h \
 	src/Interface/NumberText.cpp \
 	src/Interface/NumberText.h \
+	src/Interface/ScrollBar.cpp \
+	src/Interface/ScrollBar.h \
 	src/Interface/Slider.cpp \
 	src/Interface/Slider.h \
 	src/Interface/TextButton.cpp \
@@ -427,8 +431,6 @@ openxcom_SOURCES = \
 	src/Interface/ToggleTextButton.h \
 	src/Interface/Window.cpp \
 	src/Interface/Window.h \
-	src/Interface/ComboBox.cpp \
-	src/Interface/ComboBox.h \
 	src/lodepng.cpp \
 	src/lodepng.h \
 	src/main.cpp \

Run-Win64-Debug.bat

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

bin/data/Language/en-GB.yml

@@ -22,7 +22,7 @@ en-GB:
   STR_MUTON_UFOPEDIA: "This humanoid creature is physically powerful and intelligent.  They have a particular appetite for consuming raw flesh of any kind, which they need for sustenance like earth based carnivores.  They appear to rely on telepathic commands from a race known as 'Ethereals'.  Once separated from this telepathic link their mental system appears to break down and they die. The cybernetic implants are used to enhance their combat performance.  They are clearly the foot soldiers for a higher intelligence."
   STR_MUTON_AUTOPSY: "Muton autopsy"
   STR_MUTON_AUTOPSY_UFOPEDIA: "The 'skin' of this creature appears to be an organically created protective armour which is grafted onto the body.  There are numerous cybernetic implants which are used to enhance the cardio-vascular system and the senses.  The reproductive organs appear to have been surgically removed. Evidently these unfortunate creatures are limited to a life of warfare and conquest.  Armour piercing ammunition is not very effective against their toughened skin."
-  STR_CELATID_UFOPEDIA: "This life-form has the mysterious natural ability to float through the air.  It appears to detect human brain waves and will move towards a human target even if well hidden.  Once a target is detected the Celatid lands and fires small globules of extremely corrosive venom.  The creature has the ability to clone itself at an alarming rate. It accompanies the Muton race in its wonderings."
+  STR_CELATID_UFOPEDIA: "This life-form has the mysterious natural ability to float through the air.  It appears to detect human brain waves and will move towards a human target even if well hidden.  Once a target is detected the Celatid lands and fires small globules of extremely corrosive venom.  The creature has the ability to clone itself at an alarming rate. It accompanies the Muton race in its wanderings."
   STR_CELATID_AUTOPSY: "Celatid autopsy"
   STR_CELATID_AUTOPSY_UFOPEDIA: "The core contains a small bio-mechanical device which appears to be a naturally evolved anti-gravity propulsion system.  The sac of venom is the largest organ and there does not appear to be a separate brain structure. There is no discernible digestive or reproductive system. A small organ contains embryos which can grow rapidly into a new being."
   STR_SILACOID_UFOPEDIA: "This silicon based life form generates an enormous amount of heat.  It has the strength to crush rocks which can then be ingested by the hot core.  It has a primitive intelligence and can be controlled by implants or telepathic beings. It works with the Muton alien race."
@@ -1121,10 +1121,10 @@ 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_STORAGELIMITSENFORCED: "Storage limits"
-  STR_STORAGELIMITSENFORCED_DESC: "Live alien containment and general stores limits will be imposed at all times."
+  STR_STORAGELIMITSENFORCED: "Storage limits for recovered items"
+  STR_STORAGELIMITSENFORCED_DESC: "Enforces alien containment and general store limits for live aliens and artifacts recovered from missions, unlike UFO: Enemy Unknown."
   STR_CANSELLLIVEALIENS: "Live alien sale"
-  STR_CANSELLLIVEALIENS_DESC: "Allows the sale of live aliens, recommended when using containment limits."
+  STR_CANSELLLIVEALIENS_DESC: "Allows the sale of live aliens, recommended when using storage limits."
   STR_ALLOWAUTOSELLPRODUCTION: "Manufacture auto-sale"
   STR_ALLOWAUTOSELLPRODUCTION_DESC: "Right-click the increase button on a manufacturing project's \"total to produce\" to auto-sell."
   STR_ALLOWBUILDINGQUEUE: "Allow building queue"
@@ -1136,7 +1136,7 @@ en-GB:
   STR_BATTLEUFOEXTENDERACCURACY: "UFO Extender accuracy"
   STR_BATTLEUFOEXTENDERACCURACY_DESC: "Accuracy of shots drops off after a certain distance, according to shot type. Adjusted accuracy will be displayed on the cursor."
   STR_CANMANUFACTUREMOREITEMSPERHOUR: "TFTD manufacture rules"
-  STR_CANMANUFACTUREMOREITEMSPERHOUR_DESC: "Allows manufacturing projects to produce multiple items per hour, as opposed to X-COM: UFO Defense's one item limit."
+  STR_CANMANUFACTUREMOREITEMSPERHOUR_DESC: "Allows manufacturing projects to produce multiple items per hour, as opposed to UFO: Enemy Unknown's one item limit."
   STR_CANTRANSFERCRAFTSWHILEAIRBORNE: "Airborne transfers"
   STR_CANTRANSFERCRAFTSWHILEAIRBORNE_DESC: "Craft currently in-flight can be transferred."
   STR_CRAFTLAUNCHALWAYS: "Force craft launch"
@@ -1326,18 +1326,24 @@ en-GB:
   STR_FULL_DISPLAY: "Full Display"
   STR_FPS_LIMIT: "FPS limit"
   STR_FPS_LIMIT_DESC: "Limits the number of screen updates per second, 0 for no limit. If OpenGL rendering is enabled, the game uses Vsync instead."
-  STR_NOALIENPANICMESSAGES: "Supress panic messages for aliens."
+  STR_NOALIENPANICMESSAGES: "Supress panic messages for aliens"
   STR_NOALIENPANICMESSAGES_DESC: "Don't show panic messages for aliens unless they are visible to the player."
   STR_ALIENBLEEDING: "Alien bleeding"
   STR_ALIENBLEEDING_DESC: "Allows fatal wounds to be inflicted on most aliens."
   STR_FIELDPROMOTIONS: "Field promotions"
   STR_FIELDPROMOTIONS_DESC: "Only soldiers that were present at the mission site are eligible for promotion."
   STR_IRONMAN: "IRONMAN"
-  STR_IRONMAN_DESC: "No manual saving. All choices are permanent."
+  STR_IRONMAN_DESC: "No manual saving"
   STR_SAVE_AND_ABANDON_GAME: "SAVE AND ABANDON GAME"
   STR_MOD_UNSUCCESSFUL: "Mod failed to load"
   STR_NEW_SAVED_GAME_SLOT: "<NEW SAVED GAME>"
   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."
+  STR_PREFERRED_MUSIC_FORMAT: "Music Format"
+  STR_PREFERRED_MUSIC_FORMAT_DESC: "Chooses the preferred music format to use when multiple ones are available.{NEWLINE}NOTE: MIDI playback may be buggy on Windows."
+  STR_PREFERRED_SFX_FORMAT: "SFX Format"
+  STR_PREFERRED_SFX_FORMAT_DESC: "Chooses the preferred sound effects format to use when multiple ones are available."
+  STR_PREFERRED_FORMAT_AUTO: "Auto"
+  STR_CURRENT_FORMAT: "Current: {0}"

bin/data/Language/en-US.yml

@@ -1121,10 +1121,10 @@ 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_STORAGELIMITSENFORCED: "Storage limits"
-  STR_STORAGELIMITSENFORCED_DESC: "Live alien containment and general stores limits will be imposed at all times."
+  STR_STORAGELIMITSENFORCED: "Storage limits for recovered items"
+  STR_STORAGELIMITSENFORCED_DESC: "Enforces alien containment and general store limits for live aliens and artifacts recovered from missions, unlike X-COM: UFO Defense."
   STR_CANSELLLIVEALIENS: "Live alien sale"
-  STR_CANSELLLIVEALIENS_DESC: "Allows the sale of live aliens, recommended when using containment limits."
+  STR_CANSELLLIVEALIENS_DESC: "Allows the sale of live aliens, recommended when using storage limits."
   STR_ALLOWAUTOSELLPRODUCTION: "Manufacture auto-sale"
   STR_ALLOWAUTOSELLPRODUCTION_DESC: "Right-click the increase button on a manufacturing project's \"total to produce\" to auto-sell."
   STR_ALLOWBUILDINGQUEUE: "Allow building queue"
@@ -1326,18 +1326,24 @@ en-US:
   STR_FULL_DISPLAY: "Full Display"
   STR_FPS_LIMIT: "FPS limit"
   STR_FPS_LIMIT_DESC: "Limits the number of screen updates per second, 0 for no limit. If OpenGL rendering is enabled, the game uses Vsync instead."
-  STR_NOALIENPANICMESSAGES: "Supress panic messages for aliens."
+  STR_NOALIENPANICMESSAGES: "Supress panic messages for aliens"
   STR_NOALIENPANICMESSAGES_DESC: "Don't show panic messages for aliens unless they are visible to the player."
   STR_ALIENBLEEDING: "Alien bleeding"
   STR_ALIENBLEEDING_DESC: "Allows fatal wounds to be inflicted on most aliens."
   STR_FIELDPROMOTIONS: "Field promotions"
   STR_FIELDPROMOTIONS_DESC: "Only soldiers that were present at the mission site are eligible for promotion."
   STR_IRONMAN: "IRONMAN"
-  STR_IRONMAN_DESC: "No manual saving. All choices are permanent."
+  STR_IRONMAN_DESC: "No manual saving"
   STR_SAVE_AND_ABANDON_GAME: "SAVE AND ABANDON GAME"
   STR_MOD_UNSUCCESSFUL: "Mod failed to load"
   STR_NEW_SAVED_GAME_SLOT: "<NEW SAVED GAME>"
   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."
+  STR_PREFERRED_MUSIC_FORMAT: "Music Format"
+  STR_PREFERRED_MUSIC_FORMAT_DESC: "Chooses the preferred music format to use when multiple ones are available.{NEWLINE}NOTE: MIDI playback may be buggy on Windows."
+  STR_PREFERRED_SFX_FORMAT: "SFX Format"
+  STR_PREFERRED_SFX_FORMAT_DESC: "Chooses the preferred sound effects format to use when multiple ones are available."
+  STR_PREFERRED_FORMAT_AUTO: "Auto"
+  STR_CURRENT_FORMAT: "Current: {0}"

bin/data/Ruleset/Xcom1Ruleset.rul

@@ -1972,7 +1972,7 @@ items:
     bigSprite: 33
     floorSprite: 32
     handSprite: 88
-    meleeSound: 36
+    hitSound: 36
     battleType: 9
     twoHanded: true
     invWidth: 1
@@ -1996,6 +1996,7 @@ items:
     twoHanded: true
     invWidth: 1
     invHeight: 3
+    skillApplied: false
   - type: STR_ELECTRO_FLARE
     size: 0.1
     costBuy: 60
@@ -2830,7 +2831,7 @@ items:
 # Usage of this is hard-coded.
 # DO NOT DELETE!
   - type: ALIEN_PSI_WEAPON
-    meleeSound: 36
+    hitSound: 36
     battleType: 9
     tuUse: 25
     flatRate: true

src/Basescape/BuildFacilitiesState.cpp

@@ -47,7 +47,7 @@ BuildFacilitiesState::BuildFacilitiesState(Game *game, Base *base, State *state)
 	// Create objects
 	_window = new Window(this, 128, 160, 192, 40, POPUP_VERTICAL);
 	_btnOk = new TextButton(112, 16, 200, 176);
-	_lstFacilities = new TextList(112, 104, 200, 64);
+	_lstFacilities = new TextList(100, 104, 200, 64);
 	_txtTitle = new Text(118, 17, 197, 48);
 
 	// Set palette
@@ -76,9 +76,8 @@ BuildFacilitiesState::BuildFacilitiesState(Game *game, Base *base, State *state)
 
 	_lstFacilities->setColor(Palette::blockOffset(13)+5);
 	_lstFacilities->setArrowColor(Palette::blockOffset(13)+5);
-	_lstFacilities->setColumns(1, 112);
+	_lstFacilities->setColumns(1, 100);
 	_lstFacilities->setSelectable(true);
-	_lstFacilities->setScrolling(true, -12);
 	_lstFacilities->setBackground(_window);
 	_lstFacilities->setMargin(2);
 	_lstFacilities->setWordWrap(true);

src/Basescape/CraftsState.cpp

@@ -33,6 +33,7 @@
 #include "../Menu/ErrorMessageState.h"
 #include "CraftInfoState.h"
 #include "SellState.h"
+#include "../Savegame/SavedGame.h"
 
 namespace OpenXcom
 {
@@ -148,7 +149,7 @@ void CraftsState::btnOkClick(Action *)
 {
 	_game->popState();
 
-	if (Options::storageLimitsEnforced && _base->storesOverfull())
+	if (_game->getSavedGame()->getMonthsPassed() > -1 && Options::storageLimitsEnforced && _base->storesOverfull())
 	{
 		_game->pushState(new SellState(_game, _base));
 		_game->pushState(new ErrorMessageState(_game, tr("STR_STORAGE_EXCEEDED").arg(_base->getName()).c_str(), _palette, Palette::blockOffset(15)+1, "BACK01.SCR", 0));

src/Basescape/ManageAlienContainmentState.cpp

@@ -217,14 +217,21 @@ void ManageAlienContainmentState::btnOkClick(Action *)
 			// remove the aliens
 			_base->getItems()->removeItem(_aliens[i], _qtys[i]);
 
-			// add the corpses
-			_base->getItems()->addItem(
-				_game->getRuleset()->getArmor(
-					_game->getRuleset()->getUnit(
-						_aliens[i]
-					)->getArmor()
-				)->getCorpseGeoscape(), _qtys[i]
-			); // ;)
+			if (Options::canSellLiveAliens)
+			{
+				_game->getSavedGame()->setFunds(_game->getSavedGame()->getFunds() + _game->getRuleset()->getItem(_aliens[i])->getSellCost() * _qtys[i]);
+			}
+			else
+			{				
+				// add the corpses
+				_base->getItems()->addItem(
+					_game->getRuleset()->getArmor(
+						_game->getRuleset()->getUnit(
+							_aliens[i]
+						)->getArmor()
+					)->getCorpseGeoscape(), _qtys[i]
+				); // ;)
+			}
 		}
 	}
 	_game->popState();

src/Basescape/PurchaseState.cpp

@@ -19,6 +19,7 @@
 #include "PurchaseState.h"
 #include <sstream>
 #include <climits>
+#include <cfloat>
 #include <cmath>
 #include <iomanip>
 #include "../aresame.h"
@@ -53,7 +54,7 @@ namespace OpenXcom
  * @param game Pointer to the core game.
  * @param base Pointer to the base to get info from.
  */
-PurchaseState::PurchaseState(Game *game, Base *base) : State(game), _base(base), _crafts(), _items(), _qtys(), _sel(0), _itemOffset(0), _total(0), _pQty(0), _cQty(0), _iQty(0)
+PurchaseState::PurchaseState(Game *game, Base *base) : State(game), _base(base), _crafts(), _items(), _qtys(), _sel(0), _itemOffset(0), _total(0), _pQty(0), _cQty(0), _iQty(0.0)
 {
 	// Create objects
 	_window = new Window(this, 320, 200, 0, 0);
@@ -485,7 +486,7 @@ void PurchaseState::increaseByValue(int change)
 		_game->pushState(new ErrorMessageState(_game, "STR_NO_FREE_HANGARS_FOR_PURCHASE", _palette, Palette::blockOffset(15)+1, "BACK13.SCR", 0));
 	}
 	else if (_sel >= 3 + _crafts.size()
-		&& _iQty + _game->getRuleset()->getItem(_items[_sel - 3 - _crafts.size()])->getSize() > (10 * _base->getAvailableStores() - (int)(10 *_base->getUsedStores() + 0.5)))
+		&& _iQty + _game->getRuleset()->getItem(_items[_sel - 3 - _crafts.size()])->getSize() > _base->getAvailableStores() - _base->getUsedStores())
 	{
 		_timerInc->stop();
 		_game->pushState(new ErrorMessageState(_game, "STR_NOT_ENOUGH_STORE_SPACE", _palette, Palette::blockOffset(15)+1, "BACK13.SCR", 0));
@@ -513,18 +514,14 @@ void PurchaseState::increaseByValue(int change)
 			RuleItem *rule = _game->getRuleset()->getItem(_items[_sel - 3 - _crafts.size()]);
 
 			// Item count
-			int storesNeededPerItem = (int)(10 * rule->getSize());
-			int freeStores = 10 * _base->getAvailableStores() - (int)(10 * _base->getUsedStores() + 0.5) - _iQty;
-			int maxByStores;
-			if (storesNeededPerItem == 0)
+			double storesNeededPerItem = rule->getSize();
+			double freeStores = _base->getAvailableStores() - _base->getUsedStores() - _iQty;
+			double maxByStores = DBL_MAX;
+			if (!AreSame(storesNeededPerItem, 0.0))
 			{
-				maxByStores = INT_MAX;
+				maxByStores = (freeStores + 0.05) / storesNeededPerItem;
 			}
-			else
-			{
-				maxByStores = freeStores / storesNeededPerItem;
-			}
-			change = std::min(maxByStores, change);
+			change = std::min((int)maxByStores, change);
 			_iQty += change * storesNeededPerItem;
 		}
 		_qtys[_sel] += change;
@@ -553,13 +550,20 @@ void PurchaseState::decreaseByValue(int change)
 	change = std::min(_qtys[_sel], change);
 
 	// Personnel count
-	if (_sel <= 2) _pQty -= change;
+	if (_sel <= 2)
+	{
+		_pQty -= change;
+	}
 	// Craft count
-	else if (_sel >= 3 && _sel < 3 + _crafts.size()) _cQty -= change;
+	else if (_sel >= 3 && _sel < 3 + _crafts.size())
+	{
+		_cQty -= change;
+	}
 	// Item count
 	else
-		 _iQty -= (int)(10 * _game->getRuleset()->getItem(_items[_sel - 3 - _crafts.size()])->getSize()) * change;
-
+	{
+		_iQty -= _game->getRuleset()->getItem(_items[_sel - 3 - _crafts.size()])->getSize() * change;
+	}
 	_qtys[_sel] -= change;
 	_total -= getPrice() * change;
 	updateItemStrings();
@@ -591,12 +595,12 @@ void PurchaseState::updateItemStrings()
 		}
 	}
 	ss5 << _base->getUsedStores();
-	if (_iQty != 0)
+	if (std::abs(_iQty) > 0.05)
 	{
 		ss5 << "(";
-		if (_iQty > 0)
+		if (_iQty > 0.05)
 			ss5 << "+";
-		ss5 << std::fixed << std::setprecision(1) << (float)_iQty/10 << ")";
+		ss5 << std::fixed << std::setprecision(1) << _iQty << ")";
 	}
 	ss5 << ":" << _base->getAvailableStores();
 	_txtSpaceUsed->setText(tr("STR_SPACE_USED").arg(ss5.str()));

src/Basescape/PurchaseState.h

@@ -49,7 +49,8 @@ class PurchaseState : public State
 	std::vector<std::string> _crafts, _items;
 	std::vector<int> _qtys;
 	size_t _sel, _itemOffset;
-	int _total, _pQty, _cQty, _iQty;
+	int _total, _pQty, _cQty;
+	double _iQty;
 	Timer *_timerInc, *_timerDec;
 	/// Gets selected price.
 	int getPrice();