1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

- New Feature: enemy assassins disguise as militia and can ambush player mercs

Browse Source 
- Fix: invalid GridNo for mounting weapons

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5753 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2012-12-30 19:20:36 +00:00
parent 3e859f91a8
commit e193f05865
31 changed files with 600 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+12 -26
View File
@@ -3066,35 +3066,21 @@ BOOLEAN HandleAtNewGridNo( SOLDIERTYPE *pSoldier, BOOLEAN *pfKeepMoving )
}
}
else if ( pSoldier->bTeam == CIV_TEAM && pSoldier->ubProfile != NO_PROFILE && pSoldier->aiData.bNeutral )
else if ( pSoldier->bTeam == CIV_TEAM && pSoldier->IsAssassin() && pSoldier->aiData.bNeutral )
{
switch( pSoldier->ubProfile )
{
case JIM:
case JACK:
case OLAF:
case RAY:
case OLGA:
case TYRONE:
{
INT32 sDesiredMercDist;
INT32 sDesiredMercDist;
if (!TileIsOutOfBounds(ClosestPC( pSoldier, &sDesiredMercDist )))
{
if ( sDesiredMercDist <= NPC_TALK_RADIUS * 2 )
{
// stop
CancelAIAction( pSoldier, TRUE );
// aaaaaaaaaaaaaaaaaaaaatttaaaack!!!!
AddToShouldBecomeHostileOrSayQuoteList( pSoldier->ubID );
//MakeCivHostile( pSoldier, 2 );
//TriggerNPCWithIHateYouQuote( pSoldier->ubProfile );
}
}
if (!TileIsOutOfBounds(ClosestPC( pSoldier, &sDesiredMercDist )))
{
if ( sDesiredMercDist <= NPC_TALK_RADIUS * 2 )
{
// stop
CancelAIAction( pSoldier, TRUE );
// aaaaaaaaaaaaaaaaaaaaatttaaaack!!!!
AddToShouldBecomeHostileOrSayQuoteList( pSoldier->ubID );
//MakeCivHostile( pSoldier, 2 );
//TriggerNPCWithIHateYouQuote( pSoldier->ubProfile );
}
break;
default:
break;
}
}