Skip to content

Commit 6414d6a

Browse files
committed
add some UFOExtender options:
Alien bleeding
1 parent 1cdda87 commit 6414d6a

5 files changed

Lines changed: 8 additions & 2 deletions

File tree

bin/data/Language/en-GB.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,3 +1324,5 @@ en-GB:
13241324
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."
13251325
STR_NOALIENPANICMESSAGES: "Supress panic messages for aliens"
13261326
STR_NOALIENPANICMESSAGES_DESC: "Don't show panic messages for aliens unless it is visible to the player."
1327+
STR_ALIENBLEEDING: "Alien bleeding"
1328+
STR_ALIENBLEEDING_DESC: "Allows fatal wounds to be inflicted on most aliens"

bin/data/Language/en-US.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,3 +1324,5 @@ en-US:
13241324
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."
13251325
STR_NOALIENPANICMESSAGES: "Supress panic messages for aliens"
13261326
STR_NOALIENPANICMESSAGES_DESC: "Don't show panic messages for aliens unless it is visible to the player."
1327+
STR_ALIENBLEEDING: "Alien bleeding"
1328+
STR_ALIENBLEEDING_DESC: "Allows fatal wounds to be inflicted on most aliens"

src/Engine/Options.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ void create()
165165
_info.push_back(OptionInfo("skipNextTurnScreen", &skipNextTurnScreen, false, "STR_SKIPNEXTTURNSCREEN", "STR_BATTLESCAPE"));
166166
_info.push_back(OptionInfo("TFTDDamage", &TFTDDamage, false, "STR_TFTDDAMAGE", "STR_BATTLESCAPE"));
167167
_info.push_back(OptionInfo("noAlienPanicMessages", &noAlienPanicMessages, false, "STR_NOALIENPANICMESSAGES", "STR_BATTLESCAPE"));
168+
_info.push_back(OptionInfo("alienBleeding", &alienBleeding, false, "STR_ALIENBLEEDING", "STR_BATTLESCAPE"));
168169

169170
// controls
170171
_info.push_back(OptionInfo("keyOk", &keyOk, SDLK_RETURN, "STR_OK", "STR_GENERAL"));

src/Engine/Options.inc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ OPT PathPreview battleNewPreviewPath;
2929
OPT int battleScrollSpeed, battleDragScrollButton, battleFireSpeed, battleXcomSpeed, battleAlienSpeed, battleExplosionHeight, battlescapeScale;
3030
OPT bool traceAI, sneakyAI, battleInstantGrenade, battleNotifyDeath, battleTooltips, battleHairBleach, battleAutoEnd,
3131
strafe, showMoreStatsInInventoryView, allowPsionicCapture, skipNextTurnScreen, disableAutoEquip,
32-
battleUFOExtenderAccuracy, battleConfirmFireMode, battleSmoothCamera, TFTDDamage, noAlienPanicMessages;
32+
battleUFOExtenderAccuracy, battleConfirmFireMode, battleSmoothCamera, TFTDDamage, noAlienPanicMessages, alienBleeding;
3333
OPT SDLKey keyBattleLeft, keyBattleRight, keyBattleUp, keyBattleDown, keyBattleLevelUp, keyBattleLevelDown, keyBattleCenterUnit, keyBattlePrevUnit, keyBattleNextUnit, keyBattleDeselectUnit,
3434
keyBattleUseLeftHand, keyBattleUseRightHand, keyBattleInventory, keyBattleMap, keyBattleOptions, keyBattleEndTurn, keyBattleAbort, keyBattleStats, keyBattleKneel,
3535
keyBattleReserveKneel, keyBattleReload, keyBattlePersonalLighting, keyBattleReserveNone, keyBattleReserveSnap, keyBattleReserveAimed, keyBattleReserveAuto,

src/Savegame/BattleUnit.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "../Engine/Surface.h"
2727
#include "../Engine/Language.h"
2828
#include "../Engine/Logger.h"
29+
#include "../Engine/Options.h"
2930
#include "../Battlescape/Pathfinding.h"
3031
#include "../Battlescape/BattlescapeGame.h"
3132
#include "../Battlescape/BattleAIState.h"
@@ -2186,7 +2187,7 @@ int BattleUnit::getMoveSound() const
21862187
*/
21872188
bool BattleUnit::isWoundable() const
21882189
{
2189-
return (_type=="SOLDIER");
2190+
return (_type=="SOLDIER" || (Options::alienBleeding && _faction != FACTION_PLAYER && _armor->getSize() == 1));
21902191
}
21912192
/**
21922193
* Get whether the unit is affected by morale loss.

0 commit comments

Comments
 (0)