- Changed jumping hotkey from >Shift+Mouse Button< to >Ctrl+Shift+Mouse Button<

- "Flexing" idle animation made rare, unless the merc has Show Off personality.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5702 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sandro
2012-11-26 19:01:25 +00:00
parent d3d47da188
commit d60507a020
4 changed files with 43 additions and 10 deletions
+20
View File
@@ -1804,6 +1804,26 @@ BOOLEAN AdjustToNextAnimationFrame( SOLDIERTYPE *pSoldier )
continue;
}
}
// If it is lookaround animation, don't play it if we see at least one enemy
if ( pAnimDef->ubFlags & RANDOM_ANIM_SHOWOFF )
{
// enemy on sight, don't pretend we don't see him!
if ( pSoldier->ubProfile != NO_PROFILE )
{
if ( gMercProfiles[ pSoldier->ubProfile ].bCharacterTrait != CHAR_TRAIT_SHOWOFF && Random( 10 ) < 9 )
{
continue;
}
}
else
{
if ( Random( 10 ) < 7 )
{
continue;
}
}
}
// If we are an alternate big guy and have been told to use a normal big merc ani...
//if ( ( pAnimDef->ubFlags & RANDOM_ANIM_FIRSTBIGMERC ) && ( pSoldier->uiAnimSubFlags & SUB_ANIM_BIGGUYTHREATENSTANCE ) )