mirror of
https://github.com/1dot13/source.git
synced 2026-09-16 14:47:17 +02:00
added new option in Skills_Settings.ini: [Covert Ops] COVERT_TURNCOATS_ACTIVATE_IN_AUTORESOLVE
if enabled, turncoats will automatically activate when entering an autoresolve battle git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9365 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -7281,7 +7281,7 @@ void RemoveCapturedEnemiesFromSectorInfo( INT16 sMapX, INT16 sMapY, INT8 bMapZ )
|
||||
|
||||
// Flugente: turncoats
|
||||
if ( pTeamSoldier->usSoldierFlagMask2 & SOLDIER_TURNCOAT )
|
||||
RemoveOneTurncoat( sMapX, sMapY, pTeamSoldier->ubSoldierClass );
|
||||
RemoveOneTurncoat( sMapX, sMapY, pTeamSoldier->ubSoldierClass, FALSE );
|
||||
|
||||
// Flugente: campaign stats
|
||||
gCurrentIncident.AddStat( pTeamSoldier, CAMPAIGNHISTORY_TYPE_PRISONER );
|
||||
|
||||
@@ -114,7 +114,7 @@ extern UINT8 gubInterruptProvoker;
|
||||
|
||||
extern UINT16 PickSoldierReadyAnimation( SOLDIERTYPE *pSoldier, BOOLEAN fEndReady, BOOLEAN fHipStance );
|
||||
|
||||
extern bool RemoveOneTurncoat( INT16 sSectorX, INT16 sSectorY, UINT8 aSoldierClass );
|
||||
extern bool RemoveOneTurncoat( INT16 sSectorX, INT16 sSectorY, UINT8 aSoldierClass, BOOLEAN alsoRemoveFromGroup );
|
||||
extern void PlaySplashSound(INT32 sGridNo);
|
||||
|
||||
// Animation code explanations!
|
||||
@@ -4212,7 +4212,7 @@ BOOLEAN HandleSoldierDeath( SOLDIERTYPE *pSoldier , BOOLEAN *pfMadeCorpse )
|
||||
|
||||
// Flugente: turncoats
|
||||
if ( pSoldier->usSoldierFlagMask2 & SOLDIER_TURNCOAT )
|
||||
RemoveOneTurncoat( pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->ubSoldierClass );
|
||||
RemoveOneTurncoat( pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->ubSoldierClass, FALSE );
|
||||
|
||||
// Flugente: additional dialogue
|
||||
if ( pSoldier->ubProfile != NO_PROFILE )
|
||||
|
||||
@@ -10286,7 +10286,7 @@ UINT8 SOLDIERTYPE::SoldierTakeDamage( INT8 bHeight, INT16 sLifeDeduct, INT16 sBr
|
||||
{
|
||||
this->usSoldierFlagMask2 &= ~SOLDIER_TURNCOAT;
|
||||
|
||||
RemoveOneTurncoat( this->sSectorX, this->sSectorY, this->ubSoldierClass );
|
||||
RemoveOneTurncoat( this->sSectorX, this->sSectorY, this->ubSoldierClass, FALSE );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21804,7 +21804,7 @@ BOOLEAN SOLDIERTYPE::OrderTurnCoatToSwitchSides( UINT16 usID )
|
||||
{
|
||||
// remove turncoat property
|
||||
pSoldier->usSoldierFlagMask2 &= ~SOLDIER_TURNCOAT;
|
||||
RemoveOneTurncoat( pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->ubSoldierClass );
|
||||
RemoveOneTurncoat( pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->ubSoldierClass, TRUE );
|
||||
|
||||
MakeCivHostile( pSoldier );
|
||||
|
||||
@@ -21834,7 +21834,7 @@ void SOLDIERTYPE::OrderAllTurnCoatToSwitchSides()
|
||||
{
|
||||
// remove turncoat property
|
||||
pSoldier->usSoldierFlagMask2 &= ~SOLDIER_TURNCOAT;
|
||||
RemoveOneTurncoat( pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->ubSoldierClass );
|
||||
RemoveOneTurncoat( pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->ubSoldierClass, TRUE );
|
||||
|
||||
MakeCivHostile( pSoldier );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user