New Feature: Drug System Overhaul. The drug system has been completely overhauled.

Requires GameDir >= r2257.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=341541&#msg_341541

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7896 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-06-28 17:47:25 +00:00
parent ceea35b0e9
commit 4d9140da57
61 changed files with 1667 additions and 871 deletions
+8 -6
View File
@@ -1185,14 +1185,15 @@ INT32 AdjustBreathPts( SOLDIERTYPE * pSoldier , INT32 iBPCost )
{
sBreathFactor += 100;
}
// SANDRO - Less breath consumption for Primitive chars
if ( gGameOptions.fNewTraitSystem && gMercProfiles[pSoldier->ubProfile].bCharacterTrait == CHAR_TRAIT_PRIMITIVE )
if ( DoesMercHavePersonality( pSoldier, CHAR_TRAIT_PRIMITIVE ) )
{
sBreathFactor -= 15; // -15% breath consumption
}
// if a non-swimmer type is thrashing around in deep water
if ( (pSoldier->ubProfile != NO_PROFILE ) && (gMercProfiles[ pSoldier->ubProfile ].bDisability == NONSWIMMER) )
// if a non-swimmer type is thrashing around in deep water
if ( DoesMercHaveDisability( pSoldier, NONSWIMMER ) )
{
if ( pSoldier->usAnimState == DEEP_WATER_TRED || pSoldier->usAnimState == DEEP_WATER_SWIM)
{
@@ -1258,11 +1259,12 @@ void UnusedAPsToBreath( SOLDIERTYPE * pSoldier )
// Adjust for on drugs
HandleBPEffectDueToDrugs( pSoldier, &sBreathChange );
if ( sBreathChange > 0 )
// Flugente: why would we forbid losing breath in realtime?
/*if ( sBreathChange > 0 )
{
sBreathChange = 0;
}
else
}*/
if ( sBreathChange < 0 )
{
// We have a gain, now limit this depending on what we were doing...
// OK for RT, look at how many tiles we have moved, our last move anim