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

Author: myk002

CMakeLists.txt

@@ -7,6 +7,7 @@ option ( DEV_BUILD "Development Build. Disable this for release builds" ON )
 option ( BUILD_PACKAGE "Prepares build for creation of a package with CPack" ON )
 option ( ENABLE_WARNING "Always show warnings (even for release builds)" OFF )
 option ( FATAL_WARNING "Treat warnings as errors" OFF )
+option ( ENABLE_CLANG_ANALYSIS "When building with clang, enable the static analyzer" OFF )
 set ( MSVC_WARNING_LEVEL 3 CACHE STRING "Visual Studio warning levels" )
 option ( FORCE_INSTALL_DATA_TO_BIN "Force installation of data to binary directory" OFF )
 set ( DATADIR "" CACHE STRING "Where to place datafiles" )

Makefile.am

@@ -432,8 +432,8 @@ openxcom_SOURCES = \
 	src/Menu/DeleteGameState.h \
 	src/Menu/ErrorMessageState.cpp \
 	src/Menu/ErrorMessageState.h \
-	src/Menu/LoadState.cpp \
-	src/Menu/LoadState.h \
+	src/Menu/ListLoadState.cpp \
+	src/Menu/ListLoadState.h \
 	src/Menu/MainMenuState.cpp \
 	src/Menu/MainMenuState.h \
 	src/Menu/NewBattleState.cpp \
@@ -464,10 +464,14 @@ openxcom_SOURCES = \
 	src/Menu/AbandonGameState.h \
 	src/Menu/PauseState.cpp \
 	src/Menu/PauseState.h \
-	src/Menu/SavedGameState.cpp \
-	src/Menu/SavedGameState.h \
-	src/Menu/SaveState.cpp \
-	src/Menu/SaveState.h \
+	src/Menu/ListGamesState.cpp \
+	src/Menu/ListGamesState.h \
+	src/Menu/ListSaveState.cpp \
+	src/Menu/ListSaveState.h \
+	src/Menu/LoadGameState.cpp \
+	src/Menu/LoadGameState.h \
+	src/Menu/SaveGameState.cpp \
+	src/Menu/SaveGameState.h \
 	src/Menu/IntroState.cpp \
 	src/Menu/IntroState.h \
 	src/Menu/StartState.cpp \
@@ -535,6 +539,10 @@ openxcom_SOURCES = \
 	src/Ruleset/RuleUfo.h \
 	src/Ruleset/SoldierNamePool.cpp \
 	src/Ruleset/SoldierNamePool.h \
+	src/Ruleset/StatString.h \
+	src/Ruleset/StatString.cpp \
+	src/Ruleset/StatStringCondition.h \
+	src/Ruleset/StatStringCondition.cpp \
 	src/Ruleset/UfoTrajectory.cpp \
 	src/Ruleset/UfoTrajectory.h \
 	src/Ruleset/Unit.cpp \

bin/data/Language/en-GB.yml

@@ -665,6 +665,7 @@ en-GB:
   STR_MIND_PROBE_UFOPEDIA: "The mind probe is an alien communication device which is used to take information directly from brain waves. XCom units can use this device in combat to display an alien's characteristics. Click on the mind probe and the 'use' option. Then click on an alien with the cursor."
   STR_PLASMA_PISTOL_UFOPEDIA: "Plasma Pistols are a lethal alien weapon based on accelerating particles from within a minute anti-gravity field."
   STR_PLASMA_RIFLE_UFOPEDIA: "This is a devastatingly powerful weapon based on accelerating particles from within a minute anti-gravity field."
+  STR_HEAVY_PLASMA_UFOPEDIA: "This is a devastatingly powerful weapon based on accelerating particles from within a minute anti-gravity field."
   STR_BLASTER_LAUNCHER_UFOPEDIA: "This is an alien guided missile launcher which fires powerful 'blaster bombs'. When you click to fire the weapon it will generate 'way points' for the blaster bomb to follow.  When you have positioned enough way points click on the special launch icon."
   STR_SMALL_LAUNCHER_UFOPEDIA: "A small launcher which fires stun bombs. Very useful for capturing live aliens."
   STR_ALIEN_GRENADE_UFOPEDIA: "This device works in the same way as a terrestrial grenade - except that it is more powerful."
@@ -898,7 +899,7 @@ en-GB:
   STR_UFO_HIT: "UFO HIT!"
   STR_UFO_CRASH_LANDS: "UFO CRASH LANDS!"
   STR_MINIMISE_AT_STANDOFF_RANGE_ONLY: "Minimise at Standoff Range Only"
-  STR_UFO_RETURN_FIRE: "UFO RETURN FIRE!"
+  STR_UFO_RETURN_FIRE: "UFO RETURNS FIRE!"
   STR_INTERCEPTOR_DAMAGED: ">>> INTERCEPTOR DAMAGED <<<"
   STR_INTERCEPTOR_DESTROYED: ">>> INTERCEPTOR DESTROYED <<<"
   STR_UFO_OUTRUNNING_INTERCEPTOR: "UFO OUTRUNNING INTERCEPTOR!"
@@ -1154,8 +1155,8 @@ en-GB:
   STR_STRAFE_DESC: "Enables strafing, running, and independent tank turret movement when holding CTRL."
   STR_BATTLEEXPLOSIONHEIGHT: "Explosion height"
   STR_BATTLEEXPLOSIONHEIGHT_DESC: "Change how far height-wise explosions may spread.{NEWLINE}(Flat: 0, Round: 3)"
-  STR_AUTOSAVE: "Autosave mode"
-  STR_AUTOSAVE_DESC: "0 - Disabled. 1 - Quick save and quick load. 2 - Autosave only at 00:00. All save and load buttons are disabled. 3 - Same as previous, as well as autosave on exit of the game."
+  STR_AUTOSAVE: "Autosave"
+  STR_AUTOSAVE_DESC: "Automatically saves the game at regular intervals. Doesn't apply to Ironman Mode."
   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"
@@ -1309,7 +1310,7 @@ en-GB:
   STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT: "Save pre-primed grenades"
   STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT_DESC: "Saves grenades primed during pre-battle inventory in the soldier's equipment layout."
   STR_NEWSEEDONLOAD: "Save scumming"
-  STR_NEWSEEDONLOAD_DESC: "Loading a game will reset the random number seed, so taking the same action can yield different results. Doesn't affect Ironman Mode."
+  STR_NEWSEEDONLOAD_DESC: "Loading a game will reset the random number seed, so taking the same action can yield different results. Doesn't apply to Ironman Mode."
   STR_CHANGEVALUEBYMOUSEWHEEL: "Change values with mouse wheel"
   STR_CHANGEVALUEBYMOUSEWHEEL_DESC: "Allows you to use the mouse wheel to increase/decrease values by this amount."
   STR_BATTLEHAIRBLEACH: "Enhanced soldier sprites"
@@ -1326,10 +1327,14 @@ en-GB:
   STR_HALF_DISPLAY: "1/2 Display"
   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. Note: this will only affect software modes, as OpenGL handles this itself."
-  STR_NOALIENPANICMESSAGES: "Supress panic messages for aliens"
-  STR_NOALIENPANICMESSAGES_DESC: "Don't show panic messages for aliens unless it is visible to the player."
+  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_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_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_SAVE_AND_ABANDON_GAME: "SAVE AND ABANDON GAME"
+  STR_MOD_UNSUCCESSFUL: "Mod failed to load"

bin/data/Language/en-US.yml

@@ -665,6 +665,7 @@ en-US:
   STR_MIND_PROBE_UFOPEDIA: "The mind probe is an alien communication device which is used to take information directly from brain waves.  XCom units can use this device in combat to display an alien's characteristics.  Click on the mind probe and the 'use' option.  Then click on an alien with the cursor."
   STR_PLASMA_PISTOL_UFOPEDIA: "Plasma Pistols are a lethal alien weapon based on accelerating particles from within a minute anti-gravity field."
   STR_PLASMA_RIFLE_UFOPEDIA: "This is a devastatingly powerful weapon based on accelerating particles from within a minute anti-gravity field."
+  STR_HEAVY_PLASMA_UFOPEDIA: "This is a devastatingly powerful weapon based on accelerating particles from within a minute anti-gravity field."
   STR_BLASTER_LAUNCHER_UFOPEDIA: "This is an alien guided missile launcher which fires powerful 'blaster bombs'. When you click to fire the weapon it will generate 'way points' for the blaster bomb to follow.  When you have positioned enough way points click on the special launch icon."
   STR_SMALL_LAUNCHER_UFOPEDIA: "A small launcher which fires stun bombs.  Very useful for capturing live aliens."
   STR_ALIEN_GRENADE_UFOPEDIA: "This device works in the same way as a terrestrial grenade - except that it is more powerful."
@@ -898,7 +899,7 @@ en-US:
   STR_UFO_HIT: "UFO HIT!"
   STR_UFO_CRASH_LANDS: "UFO CRASH LANDS!"
   STR_MINIMISE_AT_STANDOFF_RANGE_ONLY: "Minimize at Standoff Range Only"
-  STR_UFO_RETURN_FIRE: "UFO RETURN FIRE!"
+  STR_UFO_RETURN_FIRE: "UFO RETURNS FIRE!"
   STR_INTERCEPTOR_DAMAGED: ">>> INTERCEPTOR DAMAGED <<<"
   STR_INTERCEPTOR_DESTROYED: ">>> INTERCEPTOR DESTROYED <<<"
   STR_UFO_OUTRUNNING_INTERCEPTOR: "UFO OUTRUNNING INTERCEPTOR!"
@@ -1154,8 +1155,8 @@ en-US:
   STR_STRAFE_DESC: "Enables strafing, running, and independent tank turret movement when holding CTRL."
   STR_BATTLEEXPLOSIONHEIGHT: "Explosion height"
   STR_BATTLEEXPLOSIONHEIGHT_DESC: "Change how far height-wise explosions may spread.{NEWLINE}(Flat: 0, Round: 3)"
-  STR_AUTOSAVE: "Autosave mode"
-  STR_AUTOSAVE_DESC: "0 - Disabled. 1 - Quick save and quick load. 2 - Autosave only at 00:00. All save and load buttons are disabled. 3 - Same as previous, as well as autosave on exit of the game."
+  STR_AUTOSAVE: "Autosave"
+  STR_AUTOSAVE_DESC: "Automatically saves the game at regular intervals. Doesn't apply to Ironman Mode."
   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"
@@ -1309,7 +1310,7 @@ en-US:
   STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT: "Save pre-primed grenades"
   STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT_DESC: "Saves grenades primed during pre-battle inventory in the soldier's equipment layout."
   STR_NEWSEEDONLOAD: "Save scumming"
-  STR_NEWSEEDONLOAD_DESC: "Loading a game will reset the random number seed, so taking the same action can yield different results. Doesn't affect Ironman Mode."
+  STR_NEWSEEDONLOAD_DESC: "Loading a game will reset the random number seed, so taking the same action can yield different results. Doesn't apply to Ironman Mode."
   STR_CHANGEVALUEBYMOUSEWHEEL: "Change values with mouse wheel"
   STR_CHANGEVALUEBYMOUSEWHEEL_DESC: "Allows you to use the mouse wheel to increase/decrease values by this amount."
   STR_BATTLEHAIRBLEACH: "Enhanced soldier sprites"
@@ -1326,10 +1327,14 @@ en-US:
   STR_HALF_DISPLAY: "1/2 Display"
   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. Note: this will only affect software modes, as OpenGL handles this itself."
-  STR_NOALIENPANICMESSAGES: "Supress panic messages for aliens"
-  STR_NOALIENPANICMESSAGES_DESC: "Don't show panic messages for aliens unless it is visible to the player."
+  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_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_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_SAVE_AND_ABANDON_GAME: "SAVE AND ABANDON GAME"
+  STR_MOD_UNSUCCESSFUL: "Mod failed to load"

bin/data/Ruleset/Xcom1Ruleset.rul

@@ -1395,7 +1395,7 @@ items:
     floorSprite: 0
     handSprite: 0
     bulletSprite: 4
-    fireSound: 2
+    fireSound: 12
     compatibleAmmo:
       - STR_HWP_CANNON_SHELLS
     accuracySnap: 60
@@ -1624,7 +1624,7 @@ items:
     floorSprite: 11
     handSprite: 24
     bulletSprite: 4
-    fireSound: 2
+    fireSound: 12
     compatibleAmmo:
       - STR_HC_AP_AMMO
       - STR_HC_HE_AMMO
@@ -1694,7 +1694,7 @@ items:
     floorSprite: 7
     handSprite: 32
     bulletSprite: 3
-    fireSound: 2
+    fireSound: 12
     compatibleAmmo:
       - STR_AC_AP_AMMO
       - STR_AC_HE_AMMO
@@ -8174,7 +8174,7 @@ ufopaedia:
     section: STR_ALIEN_ARTIFACTS
     requires:
       - STR_HEAVY_PLASMA
-    text: STR_PLASMA_RIFLE_UFOPEDIA
+    text: STR_HEAVY_PLASMA_UFOPEDIA
   - id: STR_HEAVY_PLASMA_CLIP
     type_id: 4
     section: STR_ALIEN_ARTIFACTS

bin/data/Ruleset/XcomUtil_Statstrings.rul

@@ -0,0 +1,34 @@
+# Based on XcomUtil by Scott Jones and BladeFireLight
+# See http://ufopaedia.org/index.php?title=Statstrings
+# These are the default statStrings from XcomUtil.
+  statStrings:
+  - string: "x"
+    psiStrength: [~, 30]
+  - string: "P"
+    psiStrength: [80, ~]
+  - string: "p"
+    psiStrength: [60, 79]
+  - string: "K"
+    psiSkill: [60, ~]
+  - string: "k"
+    psiSkill: [30, 59]
+  - string: "b"
+    bravery: [60, ~]
+  - string: "c"
+    bravery: [~, 10]
+  - string: "w"
+    strength: [~, 25]
+  - string: "Snpr"
+    firing: [60, ~]
+    reactions: [60, ~]
+  - string: "M"
+    firing: [70, ~]
+  - string: "m"
+    firing: [60, 69]
+  - string: "Sct"
+    reactions: [50, ~]
+    tu: [60, ~]
+  - string: "R"
+    reactions: [60, ~]
+  - string: "r"
+    reactions: [50, 59]

src/Basescape/BasescapeState.cpp

@@ -115,14 +115,6 @@ BasescapeState::BasescapeState(Game *game, Base *base, Globe *globe) : State(gam
 
 	_mini->setTexture(_game->getResourcePack()->getSurfaceSet("BASEBITS.PCK"));
 	_mini->setBases(_game->getSavedGame()->getBases());
-	for (size_t i = 0; i < _game->getSavedGame()->getBases()->size(); ++i)
-	{
-		if (_game->getSavedGame()->getBases()->at(i) == _base)
-		{
-			_mini->setSelectedBase(i);
-			break;
-		}
-	}
 	_mini->onMouseClick((ActionHandler)&BasescapeState::miniClick);
 
 	_txtFacility->setColor(Palette::blockOffset(13)+10);
@@ -193,7 +185,7 @@ BasescapeState::~BasescapeState()
 		if (*i == _base)
 		{
 			exists = true;
-      break;
+			break;
 		}
 	}
 	if (!exists)
@@ -209,29 +201,8 @@ BasescapeState::~BasescapeState()
 void BasescapeState::init()
 {
 	State::init();
-	if (!_game->getSavedGame()->getBases()->empty())
-	{
-		bool exists = false;
-		for (std::vector<Base*>::iterator i = _game->getSavedGame()->getBases()->begin(); i != _game->getSavedGame()->getBases()->end() && !exists; ++i)
-		{
-			if (*i == _base)
-			{
-				exists = true;
-			}
-		}
-		// If base was removed, select first one
-		if (!exists)
-		{
-			_base = _game->getSavedGame()->getBases()->front();
-			_mini->setSelectedBase(0);
-		}
-	}
-	else
-	{
-		// Use a blank base for special case when player has no bases
-		_base = new Base(_game->getRuleset());
-	}
 
+	setBase(_base);
 	_view->setBase(_base);
 	_mini->draw();
 	_edtBase->setText(_base->getName());
@@ -257,16 +228,36 @@ void BasescapeState::init()
  */
 void BasescapeState::setBase(Base *base)
 {
-	_base = base;
-	for (size_t i = 0; i < _game->getSavedGame()->getBases()->size(); ++i)
+	if (!_game->getSavedGame()->getBases()->empty())
 	{
-		if (_game->getSavedGame()->getBases()->at(i) == _base)
+		// Check if base still exists
+		bool exists = false;
+		for (size_t i = 0; i < _game->getSavedGame()->getBases()->size(); ++i)
 		{
-			_mini->setSelectedBase(i);
-			break;
+			if (_game->getSavedGame()->getBases()->at(i) == base)
+			{
+				_base = base;
+				_mini->setSelectedBase(i);
+				_game->getSavedGame()->setSelectedBase(i);
+				exists = true;
+				break;
+			}
 		}
+		// If base was removed, select first one
+		if (!exists)
+		{
+			_base = _game->getSavedGame()->getBases()->front();
+			_mini->setSelectedBase(0);
+			_game->getSavedGame()->setSelectedBase(0);
+		}
+	}
+	else
+	{
+		// Use a blank base for special case when player has no bases
+		_base = new Base(_game->getRuleset());
+		_mini->setSelectedBase(0);
+		_game->getSavedGame()->setSelectedBase(0);
 	}
-	init();
 }
 
 /**
@@ -497,9 +488,7 @@ void BasescapeState::miniClick(Action *)
 	size_t base = _mini->getHoveredBase();
 	if (base < _game->getSavedGame()->getBases()->size())
 	{
-		_mini->setSelectedBase(base);
 		_base = _game->getSavedGame()->getBases()->at(base);
-		_game->getSavedGame()->setSelectedBase(base);
 		init();
 	}
 }
@@ -532,9 +521,7 @@ void BasescapeState::handleKeyPress(Action *action)
 		}
 		if (base > -1 && base < _game->getSavedGame()->getBases()->size())
 		{
-			_mini->setSelectedBase(base);
 			_base = _game->getSavedGame()->getBases()->at(base);
-			_game->getSavedGame()->setSelectedBase(base);
 			init();
 		}
 	}

src/Basescape/BuildFacilitiesState.cpp

@@ -120,8 +120,8 @@ void BuildFacilitiesState::PopulateBuildList()
  */
 void BuildFacilitiesState::init()
 {
-	State::init();
 	_state->init();
+	State::init();
 }
 
 /**

src/Basescape/CraftArmorState.cpp

@@ -100,7 +100,7 @@ CraftArmorState::CraftArmorState(Game *game, Base *base, size_t craft) : State(g
 	Craft *c = _base->getCrafts()->at(_craft);
 	for (std::vector<Soldier*>::iterator i = _base->getSoldiers()->begin(); i != _base->getSoldiers()->end(); ++i)
 	{
-		_lstSoldiers->addRow(3, (*i)->getName().c_str(), (*i)->getCraftString(_game->getLanguage()).c_str(), tr((*i)->getArmor()->getType()).c_str());
+		_lstSoldiers->addRow(3, (*i)->getName(true).c_str(), (*i)->getCraftString(_game->getLanguage()).c_str(), tr((*i)->getArmor()->getType()).c_str());
 
 		Uint8 color;
 		if ((*i)->getCraft() == c)

src/Basescape/CraftSoldiersState.cpp

@@ -145,7 +145,7 @@ void CraftSoldiersState::init()
 	int row = 0;
 	for (std::vector<Soldier*>::iterator i = _base->getSoldiers()->begin(); i != _base->getSoldiers()->end(); ++i)
 	{
-		_lstSoldiers->addRow(3, (*i)->getName().c_str(), tr((*i)->getRankString()).c_str(), (*i)->getCraftString(_game->getLanguage()).c_str());
+		_lstSoldiers->addRow(3, (*i)->getName(true, 19).c_str(), tr((*i)->getRankString()).c_str(), (*i)->getCraftString(_game->getLanguage()).c_str());
 
 		Uint8 color;
 		if ((*i)->getCraft() == c)