mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Convert to SoldierID
This commit is contained in:
Asdow
+15
-15
@@ -130,20 +130,20 @@ typedef struct
|
||||
class ATTACKTYPE
|
||||
{
|
||||
public:
|
||||
UINT8 ubPossible; // is this attack form possible
|
||||
UINT16 ubOpponent; // which soldier is the victim
|
||||
UINT8 ubPossible; // is this attack form possible
|
||||
SoldierID ubOpponent; // which soldier is the victim
|
||||
//CHANGED STRUCTURE VALUE BY GOTTHARD 7/14/07
|
||||
INT16 ubAimTime; // how many extra APs to spend on aiming
|
||||
INT16 ubChanceToReallyHit; // chance to hit * chance to get through cover
|
||||
INT16 ubAimTime; // how many extra APs to spend on aiming
|
||||
INT16 ubChanceToReallyHit; // chance to hit * chance to get through cover
|
||||
//END STRUCTURE CHANGE BY GOTTHARD 7/14/07
|
||||
INT16 ubAPCost; // how many APs the attack will use up
|
||||
INT32 iAttackValue; // relative worthiness of this type of attack
|
||||
INT32 sTarget; // target gridno of this attack
|
||||
INT8 bTargetLevel; // target level of this attack
|
||||
INT8 bWeaponIn; // the inv slot of the weapon in question
|
||||
INT8 bScopeMode; // SANDRO: added for scope mode and alternative weapon holding
|
||||
UINT8 ubStance; // recommended stance for attack
|
||||
UINT8 ubFriendlyFireChance; // highest chance to hit someone of our guys //dnl ch61 180813
|
||||
INT16 ubAPCost; // how many APs the attack will use up
|
||||
INT32 iAttackValue; // relative worthiness of this type of attack
|
||||
INT32 sTarget; // target gridno of this attack
|
||||
INT8 bTargetLevel; // target level of this attack
|
||||
INT8 bWeaponIn; // the inv slot of the weapon in question
|
||||
INT8 bScopeMode; // SANDRO: added for scope mode and alternative weapon holding
|
||||
UINT8 ubStance; // recommended stance for attack
|
||||
UINT8 ubFriendlyFireChance; // highest chance to hit someone of our guys //dnl ch61 180813
|
||||
|
||||
ATTACKTYPE(void){ InitAttackType(this); }
|
||||
void InitAttackType(ATTACKTYPE *pAttack);
|
||||
@@ -212,7 +212,7 @@ void CreatureDecideAlertStatus( SOLDIERTYPE *pCreature );
|
||||
// sevenfm:
|
||||
void CheckTossSelfSmoke(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow);
|
||||
void CheckTossFriendSmoke(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow);
|
||||
void CheckTossAt(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow, INT32 sTargetSpot, INT8 bTargetLevel, UINT16 ubOpponentID);
|
||||
void CheckTossAt(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow, INT32 sTargetSpot, INT8 bTargetLevel, SoldierID ubOpponentID);
|
||||
INT32 FindTossSpotInDirection(INT32 sSpot, INT8 bLevel, INT32 sTargetSpot, BOOLEAN fCheckAdjacentDirections, BOOLEAN fCheckFarther);
|
||||
void CheckTossGrenadeAt(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow, INT32 sTargetSpot, INT8 bTargetLevel, UINT8 ubGrenadeType);
|
||||
|
||||
@@ -254,7 +254,7 @@ INT32 InternalGoAsFarAsPossibleTowards(SOLDIERTYPE *pSoldier, INT32 sDesGrid, IN
|
||||
int LegalNPCDestination(SOLDIERTYPE *pSoldier, INT32 sGridno, UINT8 ubPathMode, UINT8 ubWaterOK, UINT8 fFlags);
|
||||
void LoadWeaponIfNeeded(SOLDIERTYPE *pSoldier);
|
||||
INT32 MostImportantNoiseHeard( SOLDIERTYPE *pSoldier, INT32 *piRetValue, BOOLEAN * pfClimbingNecessary, BOOLEAN * pfReachable );
|
||||
INT32 NPCConsiderInitiatingConv( SOLDIERTYPE * pNPC, UINT8 * pubDesiredMerc );
|
||||
INT32 NPCConsiderInitiatingConv( SOLDIERTYPE * pNPC, SoldierID * pubDesiredMerc );
|
||||
void NPCDoesAct(SOLDIERTYPE *pSoldier);
|
||||
void NPCDoesNothing(SOLDIERTYPE *pSoldier);
|
||||
INT8 OKToAttack(SOLDIERTYPE *ptr, int target);
|
||||
@@ -318,7 +318,7 @@ BOOLEAN GetBestAoEGridNo(SOLDIERTYPE *pSoldier, INT32* pGridNo, INT16 aRadius, U
|
||||
// Get the ID of the farthest opponent we can see, with an optional minimum range
|
||||
// puID - ID of the farthest opponent pSoldier can see
|
||||
// sRange - only return true and give an idea if opponent found is further away than this
|
||||
BOOLEAN GetFarthestOpponent(SOLDIERTYPE *pSoldier, UINT16 * puID, INT16 sRange);
|
||||
BOOLEAN GetFarthestOpponent(SOLDIERTYPE *pSoldier, SoldierID *puID, INT16 sRange);
|
||||
|
||||
// are there more allies than friends in adjacent sectors?
|
||||
BOOLEAN MoreFriendsThanEnemiesinNearbysectors(UINT8 ausTeam, INT16 aX, INT16 aY, INT8 aZ);
|
||||
|
||||
+11
-11
@@ -46,7 +46,7 @@ void DeleteAIListEntry( AILIST * pEntry )
|
||||
pEntry->pNext = NULL;
|
||||
}
|
||||
|
||||
UINT16 FindEmptyAIListEntry( void )
|
||||
SoldierID FindEmptyAIListEntry( void )
|
||||
{
|
||||
UINT16 ubLoop;
|
||||
|
||||
@@ -61,7 +61,7 @@ UINT16 FindEmptyAIListEntry( void )
|
||||
return( AI_LIST_SIZE );
|
||||
}
|
||||
|
||||
AILIST * CreateNewAIListEntry( UINT16 ubNewEntry, UINT16 ubID, INT8 bPriority )
|
||||
AILIST * CreateNewAIListEntry( UINT16 ubNewEntry, SoldierID ubID, INT8 bPriority )
|
||||
{
|
||||
gAIList[ ubNewEntry ].ubID = ubID;
|
||||
gAIList[ ubNewEntry ].bPriority = bPriority;
|
||||
@@ -69,10 +69,10 @@ AILIST * CreateNewAIListEntry( UINT16 ubNewEntry, UINT16 ubID, INT8 bPriority )
|
||||
return( &(gAIList[ ubNewEntry ]) );
|
||||
}
|
||||
|
||||
UINT16 RemoveFirstAIListEntry( void )
|
||||
SoldierID RemoveFirstAIListEntry( void )
|
||||
{
|
||||
AILIST *pOldFirstEntry;
|
||||
UINT16 ubID;
|
||||
SoldierID ubID;
|
||||
|
||||
while ( gpFirstAIListEntry != NULL)
|
||||
{
|
||||
@@ -94,7 +94,7 @@ UINT16 RemoveFirstAIListEntry( void )
|
||||
return( NOBODY );
|
||||
}
|
||||
|
||||
void RemoveAIListEntryForID( UINT16 ubID )
|
||||
void RemoveAIListEntryForID( SoldierID ubID )
|
||||
{
|
||||
AILIST * pEntry;
|
||||
AILIST * pPrevEntry;
|
||||
@@ -123,9 +123,9 @@ void RemoveAIListEntryForID( UINT16 ubID )
|
||||
// none found, that's okay
|
||||
}
|
||||
|
||||
BOOLEAN InsertIntoAIList( UINT16 ubID, INT8 bPriority )
|
||||
BOOLEAN InsertIntoAIList( SoldierID ubID, INT8 bPriority )
|
||||
{
|
||||
UINT16 ubNewEntry;
|
||||
SoldierID ubNewEntry;
|
||||
AILIST * pEntry, * pNewEntry, * pPrevEntry = NULL;
|
||||
|
||||
ubNewEntry = FindEmptyAIListEntry();
|
||||
@@ -276,15 +276,15 @@ BOOLEAN SatisfiesAIListConditions( SOLDIERTYPE * pSoldier, UINT16 * pubDoneCount
|
||||
return( TRUE );
|
||||
}
|
||||
|
||||
BOOLEAN MoveToFrontOfAIList( UINT16 ubID )
|
||||
BOOLEAN MoveToFrontOfAIList( SoldierID ubID )
|
||||
{
|
||||
// we'll have to fake this guy's alert status (in the list) to be the same as the current
|
||||
// front of the list
|
||||
INT8 bPriority;
|
||||
UINT16 ubNewEntry;
|
||||
AILIST * pNewEntry;
|
||||
SoldierID ubNewEntry;
|
||||
AILIST *pNewEntry;
|
||||
|
||||
if ( !SatisfiesAIListConditions( MercPtrs[ ubID ], NULL, FALSE ) )
|
||||
if ( !SatisfiesAIListConditions( ubID, NULL, FALSE ) )
|
||||
{
|
||||
// can't do dat!
|
||||
return( FALSE );
|
||||
|
||||
+9
-9
@@ -1,18 +1,18 @@
|
||||
#include "Types.h"
|
||||
#include "Overhead Types.h"
|
||||
|
||||
typedef struct AILIST
|
||||
{
|
||||
UINT16 ubID;
|
||||
INT8 bPriority;
|
||||
UINT8 ubUnused;
|
||||
struct AILIST * pNext;
|
||||
SoldierID ubID;
|
||||
INT8 bPriority;
|
||||
UINT8 ubUnused;
|
||||
struct AILIST *pNext;
|
||||
} AILIST;
|
||||
|
||||
#define MAX_AI_PRIORITY 100
|
||||
|
||||
extern void ClearAIList( void );
|
||||
extern AILIST * CreateNewAIListEntry( UINT16 ubNewEntry, UINT16 ubID, INT8 bAlertStatus );
|
||||
extern BOOLEAN InsertIntoAIList( UINT16 ubID, INT8 bAlertStatus );
|
||||
extern UINT16 RemoveFirstAIListEntry( void );
|
||||
extern AILIST * CreateNewAIListEntry( UINT16 ubNewEntry, SoldierID ubID, INT8 bAlertStatus );
|
||||
extern BOOLEAN InsertIntoAIList( SoldierID ubID, INT8 bAlertStatus );
|
||||
extern SoldierID RemoveFirstAIListEntry( void );
|
||||
extern BOOLEAN BuildAIListForTeam( INT8 bTeam );
|
||||
extern BOOLEAN MoveToFrontOfAIList( UINT16 ubID );
|
||||
extern BOOLEAN MoveToFrontOfAIList( SoldierID ubID );
|
||||
|
||||
+17
-17
@@ -874,7 +874,7 @@ void HandleSoldierAI( SOLDIERTYPE *pSoldier ) // FIXME - this function is named
|
||||
|
||||
void EndAIGuysTurn( SOLDIERTYPE *pSoldier )
|
||||
{
|
||||
UINT16 ubID;
|
||||
SoldierID ubID;
|
||||
|
||||
if (gfTurnBasedAI)
|
||||
{
|
||||
@@ -885,19 +885,19 @@ void EndAIGuysTurn( SOLDIERTYPE *pSoldier )
|
||||
}
|
||||
|
||||
// search for any player merc to say close call quote
|
||||
for ( ubID = gTacticalStatus.Team[ gbPlayerNum ].bFirstID; ubID <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; ubID++ )
|
||||
for ( ubID = gTacticalStatus.Team[ gbPlayerNum ].bFirstID; ubID <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; ++ubID )
|
||||
{
|
||||
if ( OK_INSECTOR_MERC( MercPtrs[ ubID ] ) )
|
||||
if ( OK_INSECTOR_MERC( ubID ) )
|
||||
{
|
||||
if ( MercPtrs[ ubID ]->flags.fCloseCall )
|
||||
if ( ubID->flags.fCloseCall )
|
||||
{
|
||||
if ( !gTacticalStatus.fSomeoneHit && MercPtrs[ ubID ]->bNumHitsThisTurn == 0 && !(MercPtrs[ ubID ]->usQuoteSaidExtFlags & SOLDIER_QUOTE_SAID_EXT_CLOSE_CALL) && Random( 3 ) == 0 )
|
||||
if ( !gTacticalStatus.fSomeoneHit && ubID->bNumHitsThisTurn == 0 && !(ubID->usQuoteSaidExtFlags & SOLDIER_QUOTE_SAID_EXT_CLOSE_CALL) && Random( 3 ) == 0 )
|
||||
{
|
||||
// say close call quote!
|
||||
TacticalCharacterDialogue( MercPtrs[ ubID ], QUOTE_CLOSE_CALL );
|
||||
MercPtrs[ ubID ]->usQuoteSaidExtFlags |= SOLDIER_QUOTE_SAID_EXT_CLOSE_CALL;
|
||||
TacticalCharacterDialogue( ubID, QUOTE_CLOSE_CALL );
|
||||
ubID->usQuoteSaidExtFlags |= SOLDIER_QUOTE_SAID_EXT_CLOSE_CALL;
|
||||
}
|
||||
MercPtrs[ ubID ]->flags.fCloseCall = FALSE;
|
||||
ubID->flags.fCloseCall = FALSE;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -942,7 +942,7 @@ void EndAIGuysTurn( SOLDIERTYPE *pSoldier )
|
||||
ubID = RemoveFirstAIListEntry();
|
||||
if (ubID != NOBODY)
|
||||
{
|
||||
StartNPCAI( MercPtrs[ ubID ] );
|
||||
StartNPCAI( ubID );
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1165,12 +1165,12 @@ INT32 FindAdjacentSpotBeside(SOLDIERTYPE *pSoldier, INT32 sGridNo)
|
||||
return(sCheapestDest);
|
||||
}
|
||||
|
||||
UINT16 GetMostThreateningOpponent( SOLDIERTYPE *pSoldier )
|
||||
SoldierID GetMostThreateningOpponent( SOLDIERTYPE *pSoldier )
|
||||
{
|
||||
UINT32 uiLoop;
|
||||
INT32 iThreatVal,iMinThreat = 30000;
|
||||
SOLDIERTYPE *pTargetSoldier;
|
||||
UINT16 ubTargetSoldier = NOBODY;
|
||||
UINT32 uiLoop;
|
||||
INT32 iThreatVal,iMinThreat = 30000;
|
||||
SOLDIERTYPE *pTargetSoldier;
|
||||
SoldierID ubTargetSoldier = NOBODY;
|
||||
|
||||
// Loop through all mercs
|
||||
|
||||
@@ -1914,7 +1914,7 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier)
|
||||
UINT16 usHandItem = pSoldier->inv[HANDPOS].usItem;
|
||||
|
||||
INT8 bSlot;
|
||||
UINT16 usSoldierIndex; // added by SANDRO
|
||||
SoldierID usSoldierIndex; // added by SANDRO
|
||||
|
||||
#ifdef TESTAICONTROL
|
||||
if (gfTurnBasedAI || gTacticalStatus.fAutoBandageMode)
|
||||
@@ -2594,7 +2594,7 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier)
|
||||
usSoldierIndex = WhoIsThere2( pSoldier->aiData.usActionData, pSoldier->bTargetLevel);
|
||||
if ( usSoldierIndex != NOBODY )
|
||||
{
|
||||
MercStealFromMerc( pSoldier, MercPtrs[usSoldierIndex] );
|
||||
MercStealFromMerc( pSoldier, usSoldierIndex );
|
||||
PossiblyStartEnemyTaunt( pSoldier, TAUNT_STEAL, usSoldierIndex );
|
||||
}
|
||||
|
||||
@@ -2628,7 +2628,7 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier)
|
||||
|
||||
case AI_ACTION_USE_SKILL:
|
||||
{
|
||||
UINT16 ubID = WhoIsThere2( pSoldier->aiData.usActionData, 0 );
|
||||
SoldierID ubID = WhoIsThere2( pSoldier->aiData.usActionData, 0 );
|
||||
|
||||
BOOLEAN result = pSoldier->UseSkill(pSoldier->usAISkillUse, pSoldier->aiData.usActionData, ubID);
|
||||
|
||||
|
||||
+28
-26
@@ -716,16 +716,16 @@ void CalcBestShot(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestShot)
|
||||
//dnl ch62 180813 ignore firing into breathless targets if there are targets in better condition
|
||||
// sevenfm: check that best opponent exists
|
||||
if (pBestShot->ubOpponent != NOBODY &&
|
||||
(Menptr[pBestShot->ubOpponent].bCollapsed || Menptr[pBestShot->ubOpponent].bBreathCollapsed) &&
|
||||
Menptr[pBestShot->ubOpponent].bBreath < OKBREATH
|
||||
&& Menptr[pBestShot->ubOpponent].bBreath < pOpponent->bBreath)
|
||||
(pBestShot->ubOpponent->bCollapsed || pBestShot->ubOpponent->bBreathCollapsed) &&
|
||||
pBestShot->ubOpponent->bBreath < OKBREATH
|
||||
&& pBestShot->ubOpponent->bBreath < pOpponent->bBreath)
|
||||
{
|
||||
iPercentBetter = PERCENT_TO_IGNORE_THREAT;
|
||||
}
|
||||
|
||||
// sevenfm: if best opponent is dying and new opponent is ok, use new opponent
|
||||
if (pBestShot->ubOpponent != NOBODY &&
|
||||
Menptr[pBestShot->ubOpponent].stats.bLife < OKLIFE &&
|
||||
pBestShot->ubOpponent->stats.bLife < OKLIFE &&
|
||||
pOpponent->stats.bLife >= OKLIFE)
|
||||
{
|
||||
iPercentBetter = PERCENT_TO_IGNORE_THREAT;
|
||||
@@ -735,7 +735,7 @@ void CalcBestShot(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestShot)
|
||||
// guy is conscious at all
|
||||
if (iPercentBetter < -PERCENT_TO_IGNORE_THREAT &&
|
||||
pBestShot->ubOpponent != NOBODY &&
|
||||
Menptr[pBestShot->ubOpponent].stats.bLife >= OKLIFE)
|
||||
pBestShot->ubOpponent->stats.bLife >= OKLIFE)
|
||||
{
|
||||
// then stick with the older guy as the better target
|
||||
continue;
|
||||
@@ -753,7 +753,7 @@ void CalcBestShot(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestShot)
|
||||
|
||||
// sevenfm: if new opponent is dying and best opponent is ok, ignore new opponent
|
||||
if (pBestShot->ubOpponent != NOBODY &&
|
||||
Menptr[pBestShot->ubOpponent].stats.bLife >= OKLIFE &&
|
||||
pBestShot->ubOpponent->stats.bLife >= OKLIFE &&
|
||||
pOpponent->stats.bLife < OKLIFE)
|
||||
{
|
||||
//DebugShot(pSoldier, String("new opponent is dying, best opponent is ok - skip"));
|
||||
@@ -845,7 +845,8 @@ void CalcBestThrow(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow)
|
||||
INT32 sGridNo, sEndGridNo, sFriendTile[MAXMERCS], sOpponentTile[MAXMERCS];
|
||||
INT8 bFriendLevel[MAXMERCS], bOpponentLevel[MAXMERCS];
|
||||
INT32 iEstDamage;
|
||||
UINT16 ubFriendCnt = 0,ubOpponentCnt = 0, ubOpponentID[MAXMERCS];
|
||||
UINT16 ubFriendCnt = 0, ubOpponentCnt = 0;
|
||||
SoldierID ubOpponentID[MAXMERCS];
|
||||
UINT8 ubMaxPossibleAimTime;
|
||||
INT16 sRawAPCost, sMinAPcost;
|
||||
UINT8 ubChanceToHit, ubChanceToGetThrough, ubChanceToReallyHit, ubFriendlyFireChance;
|
||||
@@ -1479,7 +1480,7 @@ void CalcBestThrow(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow)
|
||||
iThreatValue = iOppThreatValue[ubLoop2];
|
||||
|
||||
// estimate how much damage this tossed item would do to him
|
||||
iEstDamage = EstimateThrowDamage(pSoldier,bPayloadPocket,MercPtrs[ubOpponentID[ubLoop2]],sGridNo);
|
||||
iEstDamage = EstimateThrowDamage(pSoldier, bPayloadPocket, ubOpponentID[ubLoop2], sGridNo);
|
||||
|
||||
if (usOppDist)
|
||||
{
|
||||
@@ -1492,7 +1493,7 @@ void CalcBestThrow(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow)
|
||||
iTotalThreatValue += (iThreatValue * iEstDamage);
|
||||
|
||||
// only count opponents still standing worth shooting at (in range)
|
||||
if (Menptr[ ubOpponentID[ubLoop2] ].stats.bLife >= OKLIFE)
|
||||
if (ubOpponentID[ubLoop2]->stats.bLife >= OKLIFE)
|
||||
{
|
||||
ubOppsInRange++;
|
||||
if (usOppDist < 2)
|
||||
@@ -1599,7 +1600,7 @@ void CalcBestThrow(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow)
|
||||
// limit RPG use, unless can hit several enemies, shooting at tank or opponent is in a room
|
||||
if (ItemIsRocketLauncher(usInHand) &&
|
||||
ubOppsInRange < 2 &&
|
||||
!ARMED_VEHICLE(MercPtrs[ubOpponentID[ubLoop]]) &&
|
||||
!ARMED_VEHICLE(ubOpponentID[ubLoop]) &&
|
||||
(!InARoom(sOpponentTile[ubLoop], NULL) || pSoldier->bTeam != ENEMY_TEAM))
|
||||
{
|
||||
continue; // next gridno
|
||||
@@ -1691,7 +1692,7 @@ void CalcBestThrow(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow)
|
||||
{
|
||||
ubMinChanceToReallyHit = 30;
|
||||
}
|
||||
else if (EXPLOSIVE_GUN(usInHand) && !ARMED_VEHICLE(pSoldier) && (pBestThrow->ubOpponent == NOBODY || !ARMED_VEHICLE(MercPtrs[pBestThrow->ubOpponent])))
|
||||
else if (EXPLOSIVE_GUN(usInHand) && !ARMED_VEHICLE(pSoldier) && (pBestThrow->ubOpponent == NOBODY || !ARMED_VEHICLE(pBestThrow->ubOpponent)))
|
||||
{
|
||||
ubMinChanceToReallyHit = 80;
|
||||
}
|
||||
@@ -1916,7 +1917,7 @@ void CalcBestStab(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestStab, BOOLEAN fBladeAt
|
||||
// guy is conscious at all
|
||||
if (iPercentBetter < -PERCENT_TO_IGNORE_THREAT &&
|
||||
pBestStab->ubOpponent != NOBODY &&
|
||||
Menptr[pBestStab->ubOpponent].stats.bLife >= OKLIFE)
|
||||
pBestStab->ubOpponent->stats.bLife >= OKLIFE)
|
||||
{
|
||||
// then stick with the older guy as the better target
|
||||
continue;
|
||||
@@ -1937,12 +1938,12 @@ void CalcBestStab(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestStab, BOOLEAN fBladeAt
|
||||
// OOOF! That was a lot of work! But we've got a new best target!
|
||||
pBestStab->ubPossible = TRUE;
|
||||
pBestStab->ubOpponent = pOpponent->ubID;
|
||||
pBestStab->ubAimTime = ubBestAimTime;
|
||||
pBestStab->ubChanceToReallyHit = ubChanceToReallyHit;
|
||||
pBestStab->sTarget = pOpponent->sGridNo;
|
||||
pBestStab->bTargetLevel = pOpponent->pathing.bLevel;
|
||||
pBestStab->iAttackValue = iAttackValue;
|
||||
pBestStab->ubAPCost = ubMinAPCost + ubBestAimTime;
|
||||
pBestStab->ubAimTime = ubBestAimTime;
|
||||
pBestStab->ubChanceToReallyHit = ubChanceToReallyHit;
|
||||
pBestStab->sTarget = pOpponent->sGridNo;
|
||||
pBestStab->bTargetLevel = pOpponent->pathing.bLevel;
|
||||
pBestStab->iAttackValue = iAttackValue;
|
||||
pBestStab->ubAPCost = ubMinAPCost + ubBestAimTime;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3480,7 +3481,8 @@ BOOLEAN GetBestAoEGridNo(SOLDIERTYPE *pSoldier, INT32* pGridNo, INT16 aRadius, U
|
||||
{
|
||||
UINT16 ubLoop, ubLoop2;
|
||||
INT32 sGridNo, sFriendTile[MAXMERCS], sOpponentTile[MAXMERCS], sTabooTile[MAXMERCS];
|
||||
UINT16 ubFriendCnt = 0,ubOpponentCnt = 0, ubTabooCnt = 0, ubOpponentID[MAXMERCS];
|
||||
UINT16 ubFriendCnt = 0, ubOpponentCnt = 0, ubTabooCnt = 0;
|
||||
SoldierID ubOpponentID[MAXMERCS];
|
||||
INT32 bMaxLeft,bMaxRight,bMaxUp,bMaxDown, i, j;
|
||||
INT8 bPersOL, bPublOL;
|
||||
SOLDIERTYPE *pFriend;
|
||||
@@ -3670,7 +3672,7 @@ BOOLEAN GetBestAoEGridNo(SOLDIERTYPE *pSoldier, INT32* pGridNo, INT16 aRadius, U
|
||||
// Get the ID of the farthest opponent we can see, with an optional minimum range
|
||||
// puID - ID of the farthest opponent pSoldier can see
|
||||
// sRange - only return an true and give an idea if opponent found is further away than this
|
||||
BOOLEAN GetFarthestOpponent(SOLDIERTYPE *pSoldier, UINT16 * puID, INT16 sRange)
|
||||
BOOLEAN GetFarthestOpponent(SOLDIERTYPE *pSoldier, SoldierID *puID, INT16 sRange)
|
||||
{
|
||||
INT32 sGridNo;
|
||||
UINT32 uiLoop;
|
||||
@@ -3885,13 +3887,13 @@ void CheckTossFriendSmoke(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow)
|
||||
INT8 bLevel = pSoldier->pathing.bLevel;
|
||||
|
||||
// check all friends
|
||||
SOLDIERTYPE * pFriend;
|
||||
INT32 sClosestFriendSpot = NOWHERE;
|
||||
INT8 bClosestFriendLevel = 0;
|
||||
UINT16 ubClosestFriendID = NOBODY;
|
||||
SOLDIERTYPE *pFriend;
|
||||
INT32 sClosestFriendSpot = NOWHERE;
|
||||
INT8 bClosestFriendLevel = 0;
|
||||
SoldierID ubClosestFriendID = NOBODY;
|
||||
|
||||
INT32 sFriendSpot;
|
||||
INT8 bFriendLevel;
|
||||
INT8 bFriendLevel;
|
||||
|
||||
INT32 sClosestOpponent;
|
||||
|
||||
@@ -3999,7 +4001,7 @@ void CheckTossFriendSmoke(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow)
|
||||
|
||||
// check if we can toss grenade at spot, and prepare attack data
|
||||
// grenade should be in hand
|
||||
void CheckTossAt(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow, INT32 sTargetSpot, INT8 bTargetLevel, UINT16 ubOpponentID)
|
||||
void CheckTossAt(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow, INT32 sTargetSpot, INT8 bTargetLevel, SoldierID ubOpponentID)
|
||||
{
|
||||
UINT16 usInHand, usGrenade;
|
||||
INT32 iTossRange;
|
||||
|
||||
@@ -1154,8 +1154,8 @@ INT8 CreatureDecideActionBlack( SOLDIERTYPE * pSoldier )
|
||||
// if the selected opponent is not a threat (unconscious & !serviced)
|
||||
// (usually, this means all the guys we see our unconscious, but, on
|
||||
// rare occasions, we may not be able to shoot a healthy guy, too)
|
||||
if ((Menptr[BestShot.ubOpponent].stats.bLife < OKLIFE) &&
|
||||
!Menptr[BestShot.ubOpponent].bService)
|
||||
if ((BestShot.ubOpponent->stats.bLife < OKLIFE) &&
|
||||
!BestShot.ubOpponent->bService)
|
||||
{
|
||||
// if our attitude is NOT aggressive
|
||||
if (pSoldier->aiData.bAttitude != AGGRESSIVE)
|
||||
|
||||
@@ -595,10 +595,10 @@ INT8 DecideActionBoxerEnteringRing(SOLDIERTYPE *pSoldier)
|
||||
|
||||
INT8 DecideActionNamedNPC( SOLDIERTYPE * pSoldier )
|
||||
{
|
||||
INT32 sDesiredMercLoc;
|
||||
UINT8 ubDesiredMercDir;
|
||||
UINT8 ubDesiredMerc;
|
||||
INT32 sDesiredMercDist;
|
||||
INT32 sDesiredMercLoc;
|
||||
UINT8 ubDesiredMercDir;
|
||||
SoldierID ubDesiredMerc;
|
||||
INT32 sDesiredMercDist;
|
||||
#ifdef DEBUGDECISIONS
|
||||
STR16 tempstr;
|
||||
#endif
|
||||
|
||||
@@ -119,7 +119,7 @@ void AICenterXY( INT32 sGridNo, FLOAT * pdX, FLOAT * pdY )
|
||||
*pdY = (FLOAT) (sYPos * CELL_Y_SIZE + CELL_Y_SIZE / 2);
|
||||
}
|
||||
|
||||
INT8 CalcWorstCTGTForPosition( SOLDIERTYPE * pSoldier, UINT16 ubOppID, INT32 sOppGridNo, INT8 bLevel, INT32 iMyAPsLeft )
|
||||
INT8 CalcWorstCTGTForPosition( SOLDIERTYPE * pSoldier, SoldierID ubOppID, INT32 sOppGridNo, INT8 bLevel, INT32 iMyAPsLeft )
|
||||
{
|
||||
// When considering a gridno for cover, we want to take into account cover if we
|
||||
// lie down, so we return the LOWEST chance to get through for that location.
|
||||
@@ -158,7 +158,7 @@ INT8 CalcWorstCTGTForPosition( SOLDIERTYPE * pSoldier, UINT16 ubOppID, INT32 sOp
|
||||
return( bWorstCTGT );
|
||||
}
|
||||
|
||||
INT8 CalcAverageCTGTForPosition( SOLDIERTYPE * pSoldier, UINT16 ubOppID, INT32 sOppGridNo, INT8 bLevel, INT32 iMyAPsLeft )
|
||||
INT8 CalcAverageCTGTForPosition( SOLDIERTYPE * pSoldier, SoldierID ubOppID, INT32 sOppGridNo, INT8 bLevel, INT32 iMyAPsLeft )
|
||||
{
|
||||
// When considering a gridno for cover, we want to take into account cover if we
|
||||
// lie down, so we return the LOWEST chance to get through for that location.
|
||||
@@ -192,7 +192,7 @@ INT8 CalcAverageCTGTForPosition( SOLDIERTYPE * pSoldier, UINT16 ubOppID, INT32 s
|
||||
}
|
||||
|
||||
|
||||
INT8 CalcBestCTGT( SOLDIERTYPE *pSoldier, UINT16 ubOppID, INT32 sOppGridNo, INT8 bLevel, INT32 iMyAPsLeft )
|
||||
INT8 CalcBestCTGT( SOLDIERTYPE *pSoldier, SoldierID ubOppID, INT32 sOppGridNo, INT8 bLevel, INT32 iMyAPsLeft )
|
||||
{
|
||||
// NOTE: CTGT stands for "ChanceToGetThrough..."
|
||||
|
||||
@@ -592,7 +592,7 @@ INT32 CalcCoverValue(SOLDIERTYPE *pMe, INT32 sMyGridNo, INT32 iMyThreat, INT32 i
|
||||
UINT8 NumberOfTeamMatesAdjacent( SOLDIERTYPE * pSoldier, INT32 sGridNo )
|
||||
{
|
||||
UINT8 ubLoop, ubCount;
|
||||
UINT16 ubWhoIsThere;
|
||||
SoldierID ubWhoIsThere;
|
||||
INT32 sTempGridNo;
|
||||
|
||||
ubCount = 0;
|
||||
@@ -603,7 +603,7 @@ UINT8 NumberOfTeamMatesAdjacent( SOLDIERTYPE * pSoldier, INT32 sGridNo )
|
||||
if ( sTempGridNo != sGridNo )
|
||||
{
|
||||
ubWhoIsThere = WhoIsThere2( sTempGridNo, pSoldier->pathing.bLevel );
|
||||
if ( ubWhoIsThere != NOBODY && ubWhoIsThere != pSoldier->ubID && MercPtrs[ ubWhoIsThere ]->bTeam == pSoldier->bTeam )
|
||||
if ( ubWhoIsThere != NOBODY && ubWhoIsThere != pSoldier->ubID && ubWhoIsThere->bTeam == pSoldier->bTeam )
|
||||
{
|
||||
ubCount++;
|
||||
}
|
||||
|
||||
@@ -200,7 +200,7 @@ INT32 MostImportantNoiseHeard( SOLDIERTYPE *pSoldier, INT32 *piRetValue, BOOLEAN
|
||||
if (*pbPublOL < NOT_HEARD_OR_SEEN)
|
||||
{
|
||||
// calculate how far this noise was, and its relative "importance"
|
||||
iDistAway = SpacesAway(pSoldier->sGridNo,gsPublicLastKnownOppLoc[pSoldier->bTeam][pTemp->ubID]);
|
||||
iDistAway = SpacesAway(pSoldier->sGridNo, gsPublicLastKnownOppLoc[pSoldier->bTeam][pTemp->ubID]);
|
||||
iNoiseValue = (*pbPublOL) * iDistAway; // always a negative number!
|
||||
|
||||
if (iNoiseValue > iBestValue)
|
||||
|
||||
@@ -42,7 +42,7 @@ BOOLEAN FindAutobandageClimbPoint( INT32 sDesiredGridNo, BOOLEAN fClimbUp )
|
||||
BUILDING * pBuilding;
|
||||
UINT8 ubNumClimbSpots;
|
||||
UINT8 ubLoop;
|
||||
UINT16 ubWhoIsThere;
|
||||
SoldierID ubWhoIsThere;
|
||||
|
||||
pBuilding = FindBuilding( sDesiredGridNo );
|
||||
if (!pBuilding)
|
||||
@@ -55,12 +55,12 @@ BOOLEAN FindAutobandageClimbPoint( INT32 sDesiredGridNo, BOOLEAN fClimbUp )
|
||||
for ( ubLoop = 0; ubLoop < ubNumClimbSpots; ubLoop++ )
|
||||
{
|
||||
ubWhoIsThere = WhoIsThere2( pBuilding->sUpClimbSpots[ ubLoop ], 1 );
|
||||
if ( ubWhoIsThere != NOBODY && !CanCharacterAutoBandageTeammate( MercPtrs[ ubWhoIsThere ] ) )
|
||||
if ( ubWhoIsThere != NOBODY && !CanCharacterAutoBandageTeammate( ubWhoIsThere ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
ubWhoIsThere = WhoIsThere2( pBuilding->sDownClimbSpots[ ubLoop ], 0 );
|
||||
if ( ubWhoIsThere != NOBODY && !CanCharacterAutoBandageTeammate( MercPtrs[ ubWhoIsThere ] ) )
|
||||
if ( ubWhoIsThere != NOBODY && !CanCharacterAutoBandageTeammate( ubWhoIsThere ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@@ -122,7 +122,7 @@ BOOLEAN CanAutoBandage( BOOLEAN fDoFullCheck )
|
||||
UINT16 cnt;
|
||||
UINT16 ubMedics = 0, ubPatients = 0;
|
||||
SOLDIERTYPE * pSoldier;
|
||||
static UINT16 ubIDForFullCheck = NOBODY;
|
||||
static SoldierID ubIDForFullCheck = NOBODY;
|
||||
|
||||
// run though the list of chars on team
|
||||
cnt = gTacticalStatus.Team[ gbPlayerNum ].bFirstID;
|
||||
@@ -311,7 +311,7 @@ INT8 FindBestPatient( SOLDIERTYPE * pSoldier, BOOLEAN * pfDoClimb )
|
||||
{
|
||||
// only switch to this patient if our distance is closer than
|
||||
// the other medic's
|
||||
pOtherMedic = MercPtrs[ pPatient->ubAutoBandagingMedic ];
|
||||
pOtherMedic = pPatient->ubAutoBandagingMedic;
|
||||
sOtherAdjacentGridNo = FindAdjacentGridEx( pOtherMedic, sPatientGridNo, &ubDirection, &sAdjustedGridNo, FALSE, FALSE );
|
||||
if (sOtherAdjacentGridNo != -1)
|
||||
{
|
||||
@@ -379,8 +379,8 @@ INT8 FindBestPatient( SOLDIERTYPE * pSoldier, BOOLEAN * pfDoClimb )
|
||||
if (pBestPatient->ubAutoBandagingMedic != NOBODY)
|
||||
{
|
||||
// cancel that medic
|
||||
DebugAI(AI_MSG_INFO, MercPtrs[pBestPatient->ubAutoBandagingMedic], String("CancelAIAction: medic: find patient"));
|
||||
CancelAIAction( MercPtrs[ pBestPatient->ubAutoBandagingMedic ], TRUE );
|
||||
DebugAI(AI_MSG_INFO, pBestPatient->ubAutoBandagingMedic, String("CancelAIAction: medic: find patient"));
|
||||
CancelAIAction( pBestPatient->ubAutoBandagingMedic, TRUE );
|
||||
}
|
||||
pBestPatient->ubAutoBandagingMedic = pSoldier->ubID;
|
||||
*pfDoClimb = FALSE;
|
||||
|
||||
+6
-5
@@ -2557,12 +2557,13 @@ void Converse( UINT8 ubNPC, UINT8 ubMerc, INT8 bApproach, UINT32 uiApproachData
|
||||
}
|
||||
}
|
||||
|
||||
INT32 NPCConsiderInitiatingConv( SOLDIERTYPE * pNPC, UINT8 * pubDesiredMerc )
|
||||
INT32 NPCConsiderInitiatingConv( SOLDIERTYPE * pNPC, SoldierID * pubDesiredMerc )
|
||||
{
|
||||
INT32 sMyGridNo, sDist, sDesiredMercDist = 100;
|
||||
UINT8 ubNPC;
|
||||
UINT16 ubMerc, ubDesiredMerc = NOBODY;
|
||||
UINT8 ubTalkDesire, ubHighestTalkDesire = 0;
|
||||
INT32 sMyGridNo, sDist, sDesiredMercDist = 100;
|
||||
UINT8 ubNPC;
|
||||
UINT16 ubMerc;
|
||||
SoldierID ubDesiredMerc = NOBODY;
|
||||
UINT8 ubTalkDesire, ubHighestTalkDesire = 0;
|
||||
SOLDIERTYPE * pMerc;
|
||||
SOLDIERTYPE * pDesiredMerc = NULL;
|
||||
NPCQuoteInfo * pNPCQuoteInfoArray;
|
||||
|
||||
+4
-4
@@ -228,7 +228,7 @@ void FreeUpNPCFromLoweringGun( SOLDIERTYPE *pSoldier );
|
||||
void FreeUpNPCFromRoofClimb(SOLDIERTYPE *pSoldier );
|
||||
|
||||
UINT8 GetClosestOpponent( SOLDIERTYPE *pSoldier );
|
||||
UINT16 GetMostThreateningOpponent( SOLDIERTYPE *pSoldier );
|
||||
SoldierID GetMostThreateningOpponent( SOLDIERTYPE *pSoldier );
|
||||
|
||||
void HandleSoldierAI( SOLDIERTYPE *pSoldier );
|
||||
void HandleInitialRedAlert( INT8 bTeam, UINT8 ubCommunicate);
|
||||
@@ -271,9 +271,9 @@ INT32 FindFlankingSpot(SOLDIERTYPE *pSoldier, INT32 sPos, INT8 bAction );
|
||||
BOOLEAN CanClimbFromHere (SOLDIERTYPE * pSoldier, BOOLEAN fUp );
|
||||
|
||||
// HEADROCK HAM 3.6: Adding includes for A* cover calculations
|
||||
INT8 CalcWorstCTGTForPosition( SOLDIERTYPE * pSoldier, UINT16 ubOppID, INT32 sOppGridNo, INT8 bLevel, INT32 iMyAPsLeft );
|
||||
INT8 CalcBestCTGT( SOLDIERTYPE *pSoldier, UINT16 ubOppID, INT32 sOppGridNo, INT8 bLevel, INT32 iMyAPsLeft );
|
||||
INT8 CalcAverageCTGTForPosition( SOLDIERTYPE * pSoldier, UINT16 ubOppID, INT32 sOppGridNo, INT8 bLevel, INT32 iMyAPsLeft );
|
||||
INT8 CalcWorstCTGTForPosition( SOLDIERTYPE * pSoldier, SoldierID ubOppID, INT32 sOppGridNo, INT8 bLevel, INT32 iMyAPsLeft );
|
||||
INT8 CalcBestCTGT( SOLDIERTYPE *pSoldier, SoldierID ubOppID, INT32 sOppGridNo, INT8 bLevel, INT32 iMyAPsLeft );
|
||||
INT8 CalcAverageCTGTForPosition( SOLDIERTYPE * pSoldier, SoldierID ubOppID, INT32 sOppGridNo, INT8 bLevel, INT32 iMyAPsLeft );
|
||||
UINT8 NumberOfTeamMatesAdjacent( SOLDIERTYPE * pSoldier, INT32 sGridNo );
|
||||
|
||||
// Flugente: get the id of the closest soldier (coser than x tiles) of a specific team with a specific flag that we can currently see
|
||||
|
||||
Reference in New Issue
Block a user