teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- aiFightDudeIsAffected + aiFightGetDudesForBattle

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-03 14:16:22 +02:00
parent 55716c9409
commit a5471b1079
2 changed files with 33 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
source/games/blood/src/nnexts.cpp
View file

@ -4262,7 +4262,7 @@ bool condCheckDude(XSPRITE* pXCond, int cmpOp, bool PUSH) {
else if (!IsDudeSprite(&sprite[pXSpr->target_i]) && sprite[pXSpr->target_i].type != kMarkerPath) return false;
else if (PUSH) condPush(pXCond, OBJ_SPRITE, pXSpr->target_i);
return true;
case 1: return aiFightDudeIsAffected(pXSpr); // dude affected by ai fight?
case 1: return aiFightDudeIsAffected(actor); // dude affected by ai fight?
case 2: // distance to the target in a range?
case 3: // is the target visible?
case 4: // is the target visible with periphery?
@ -5034,21 +5034,29 @@ void aiFightFreeAllTargets(DBloodActor* sourceactor)
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
bool aiFightDudeIsAffected(XSPRITE* pXDude) {
bool aiFightDudeIsAffected(DBloodActor* dudeactor)
{
auto pXDude = &dudeactor->x();
if (pXDude->rxID <= 0 || pXDude->locked == 1) return false;
int nSprite;
StatIterator it(kStatModernDudeTargetChanger);
while ((nSprite = it.NextIndex()) >= 0)
BloodStatIterator it(kStatModernDudeTargetChanger);
while (auto actor = it.Next())
{
XSPRITE* pXSprite = (sprite[nSprite].extra >= 0) ? &xsprite[sprite[nSprite].extra] : NULL;
if (pXSprite == NULL || pXSprite->txID <= 0 || pXSprite->state != 1) continue;
for (int i = bucketHead[pXSprite->txID]; i < bucketHead[pXSprite->txID + 1]; i++) {
if (!actor->hasX()) continue;
XSPRITE* pXSprite = &actor->x();
if (pXSprite->txID <= 0 || pXSprite->state != 1) continue;
for (int i = bucketHead[pXSprite->txID]; i < bucketHead[pXSprite->txID + 1]; i++)
{
if (rxBucket[i].type != OBJ_SPRITE) continue;
auto actor = rxBucket[i].GetActor();
if (!actor || !actor->hasX() || !actor->IsDudeActor()) continue;
else if (actor->s().index == sprite[pXDude->reference].index) return true;
auto rxactor = rxBucket[i].actor;
if (!rxactor || !rxactor->hasX() || !rxactor->IsDudeActor()) continue;
else if (rxactor == dudeactor) return true;
}
}
return false;
@ -5060,9 +5068,11 @@ bool aiFightDudeIsAffected(XSPRITE* pXDude) {
//
//---------------------------------------------------------------------------
bool aiFightGetDudesForBattle(XSPRITE* pXSprite) {
for (int i = bucketHead[pXSprite->txID]; i < bucketHead[pXSprite->txID + 1]; i++) {
bool aiFightGetDudesForBattle(DBloodActor* actor)
{
auto txID = actor->x().txID;
for (int i = bucketHead[txID]; i < bucketHead[txID + 1]; i++)
{
if (rxBucket[i].type != OBJ_SPRITE) continue;
auto actor = rxBucket[i].GetActor();
if (!actor || !actor->hasX() || !actor->IsDudeActor()) continue;
@ -5070,9 +5080,12 @@ bool aiFightGetDudesForBattle(XSPRITE* pXSprite) {
}
// check redirected TX buckets
int rx = -1; XSPRITE* pXRedir = NULL;
while ((pXRedir = evrListRedirectors(OBJ_SPRITE, sprite[pXSprite->reference].extra, pXRedir, &rx)) != NULL) {
for (int i = bucketHead[rx]; i < bucketHead[rx + 1]; i++) {
int rx = -1;
XSPRITE* pXRedir = NULL;
while ((pXRedir = evrListRedirectors(OBJ_SPRITE, actor->s().extra, pXRedir, &rx)) != NULL)
{
for (int i = bucketHead[rx]; i < bucketHead[rx + 1]; i++)
{
if (rxBucket[i].type != OBJ_SPRITE) continue;
auto actor = rxBucket[i].GetActor();
if (!actor || !actor->hasX() || !actor->IsDudeActor()) continue;
@ -5636,7 +5649,7 @@ bool modernTypeOperateSprite(int nSprite, spritetype* pSprite, XSPRITE* pXSprite
if (pXSprite->state == 0) SetSpriteState(nSprite, pXSprite, 1);
[[fallthrough]];
case kCmdRepeat:
if (pXSprite->txID <= 0 || !aiFightGetDudesForBattle(pXSprite)) {
if (pXSprite->txID <= 0 || !aiFightGetDudesForBattle(actor)) {
aiFightFreeAllTargets(actor);
evPostActor(actor, 0, kCmdOff);
break;
@ -6596,7 +6609,7 @@ void useTargetChanger(XSPRITE* pXSource, spritetype* pSprite) {
}
// dude attack or attacked by target that does not fit by data id?
else if (pXSource->data1 != 666 && pXTarget->data1 != pXSource->data1) {
if (aiFightDudeIsAffected(pXTarget)) {
if (aiFightDudeIsAffected(&bloodActors[pXTarget->reference])) {
// force stop attack target
aiSetTarget_(pXSprite, pSprite->x, pSprite->y, pSprite->z);

7
source/games/blood/src/nnexts.h
View file

@ -315,13 +315,8 @@ void aiSetGenIdleState(DBloodActor*);
int aiFightGetTargetDist(DBloodActor* pSprite, DUDEINFO* pDudeInfo, DBloodActor* pTarget);
int aiFightGetFineTargetDist(DBloodActor* actor, DBloodActor* target);
bool aiFightDudeCanSeeTarget(DBloodActor* pXDude, DUDEINFO* pDudeInfo, DBloodActor* pTarget);
bool aiFightUnitCanFly(spritetype* pDude);
bool aiFightIsMeleeUnit(spritetype* pDude);
bool aiFightDudeIsAffected(XSPRITE* pXDude);
bool aiFightDudeIsAffected(DBloodActor* pXDude);
bool aiFightMatesHaveSameTarget(DBloodActor* leaderactor, DBloodActor* targetactor, int allow);
bool aiFightGetDudesForBattle(XSPRITE* pXSprite);
bool aiFightIsMateOf(XSPRITE* pXDude, XSPRITE* pXSprite);
void aiFightAlarmDudesInSight(spritetype* pSprite, int max);
void aiFightActivateDudes(int rx);
// ------------------------------------------------------------------------- //
void useSlopeChanger(XSPRITE* pXSource, int objType, int objIndex);