zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-16 20:50:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Changes in damage scale for Custom Dude

Browse source 
- Conditions: added conditions for player and enemies (WIP)
This commit is contained in:
NoOneBlood 2020-03-19 22:35:31 +03:00 committed by Christoph Oelckers
parent 014dfc346b
commit c27f3b8d20
4 changed files with 163 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/blood/src/aiunicult.cpp
View file

@ -1278,10 +1278,6 @@ void scaleDamage(XSPRITE* pXSprite) {
curScale[i] = getDudeInfo(kDudeModernCustom)->startDamage[i]; curScale[i] = getDudeInfo(kDudeModernCustom)->startDamage[i];
switch (weaponType) { switch (weaponType) {
// all enemies with vector weapons gets extra resistance to bullet damage
case kGenDudeWeaponHitscan:
curScale[kDmgBullet] -= 10;
break;
// just copy damage resistance of dude that should be summoned // just copy damage resistance of dude that should be summoned
case kGenDudeWeaponSummon: case kGenDudeWeaponSummon:
for (int i = 0; i < kDmgMax; i++) for (int i = 0; i < kDmgMax; i++)
@ -1303,7 +1299,7 @@ void scaleDamage(XSPRITE* pXSprite) {
case kMissileLifeLeechAltNormal: case kMissileLifeLeechAltNormal:
case kMissileLifeLeechAltSmall: case kMissileLifeLeechAltSmall:
case kMissileArcGargoyle: case kMissileArcGargoyle:
curScale[kDmgSpirit] = 32; curScale[kDmgSpirit] -= 32;
curScale[kDmgElectric] = 52; curScale[kDmgElectric] = 52;
break; break;
case kMissileFlareRegular: case kMissileFlareRegular:
@ -1317,14 +1313,11 @@ void scaleDamage(XSPRITE* pXSprite) {
curScale[kDmgExplode] -= 20; curScale[kDmgExplode] -= 20;
break; break;
case kMissileLifeLeechRegular: case kMissileLifeLeechRegular:
curScale[kDmgBurn] = 60 + Random(4);
fallthrough__;
case kThingDroppedLifeLeech: case kThingDroppedLifeLeech:
case kModernThingEnemyLifeLeech: case kModernThingEnemyLifeLeech:
curScale[kDmgSpirit] = 32 + Random(18); curScale[kDmgSpirit] = 32 + Random(18);
curScale[kDmgBurn] = 60 + Random(4);
for (int i = 2; i < kDmgMax; i++) {
if (Chance(0x1000) && i != kDmgSpirit)
curScale[i] = 48 + Random(32);
}
break; break;
case kMissileFireball: case kMissileFireball:
case kMissileFireballNapam: case kMissileFireballNapam:
@ -1389,7 +1382,7 @@ void scaleDamage(XSPRITE* pXSprite) {
if (yrepeat < 64) { if (yrepeat < 64) {
for (int i = 0; i < kDmgMax; i++) curScale[i] += (64 - yrepeat); for (int i = 0; i < kDmgMax; i++) curScale[i] += (64 - yrepeat);
} else if (yrepeat > 64) { } else if (yrepeat > 64) {
for (int i = 0; i < kDmgMax; i++) curScale[i] -= ((yrepeat - 64) / 2); for (int i = 0; i < kDmgMax; i++) curScale[i] -= ((yrepeat - 64) >> 2);
} }
// take surface type into account // take surface type into account

2
source/blood/src/dude.cpp
View file

@ -1570,7 +1570,7 @@ DUDEINFO dudeInfo[kDudeMax-kDudeBase] =
256, // angSpeed 256, // angSpeed
// 0, // 0,
7, -1, 18, // nGibType 7, -1, 18, // nGibType
128, 150, 128, 256, 128, 128, 128, 64, 256, 256, 256, 256, 256, 256,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0,
0 0

211
source/blood/src/nnexts.cpp
View file

@ -2062,6 +2062,30 @@ bool condPush(XSPRITE* pXSprite, int objType, int objIndex) {
return true; return true;
} }
bool condRestore(XSPRITE* pXSprite) {
pXSprite->targetX = pXSprite->target;
pXSprite->targetY = pXSprite->targetZ;
return true;
}
bool condCmp(int val, int arg1, int arg2, int arg3) {
switch (arg3) {
case 0: condCmpr(val, arg1, arg2);
case 1: return (val == arg1);
case 2: return (val >= arg1);
case 3: return (val > arg1);
case 4: return (val <= arg1);
case 5: return (val < arg1);
case 6: return (val & arg1);
default:
ThrowError("\nSpecify compare operation!");
break;
}
return false;
}
bool condCmpr(int val, int min, int max) { bool condCmpr(int val, int min, int max) {
return (max == 0) ? (val == min) : (val >= min && val <= max); return (max == 0) ? (val == min) : (val >= min && val <= max);
} }
@ -2107,6 +2131,8 @@ bool condCheckMixed(XSPRITE* pXCond, EVENT event, bool PUSH, bool RVRS) {
case 53: case 53:
case 54: case 54:
case 56: case 56:
case 57:
case 58:
switch (objType) { switch (objType) {
case OBJ_WALL: { case OBJ_WALL: {
XWALL* pXObj = (xwallRangeIsFine(wall[objIndex].extra)) ? &xwall[wall[objIndex].extra] : NULL; XWALL* pXObj = (xwallRangeIsFine(wall[objIndex].extra)) ? &xwall[wall[objIndex].extra] : NULL;
@ -2176,6 +2202,7 @@ bool condCheckSector(XSPRITE* pXCond, bool PUSH, bool RVRS) {
if (cond < (kCondRange >> 1)) { if (cond < (kCondRange >> 1)) {
switch (cond) { switch (cond) {
default: return false;
case 0: return condCmpr(pSect->floorpicnum, arg1, arg2); case 0: return condCmpr(pSect->floorpicnum, arg1, arg2);
case 1: return condCmpr(pSect->ceilingpicnum, arg1, arg2); case 1: return condCmpr(pSect->ceilingpicnum, arg1, arg2);
case 2: return condCmpr((!arg3) ? pSect->floorxpanning : pSect->floorypanning, arg1, arg2); case 2: return condCmpr((!arg3) ? pSect->floorxpanning : pSect->floorypanning, arg1, arg2);
@ -2205,27 +2232,21 @@ bool condCheckSector(XSPRITE* pXCond, bool PUSH, bool RVRS) {
} }
return false; return false;
} }
return false;
} else if (pXSect) { } else if (pXSect) {
switch (cond) { switch (cond) {
default: return false;
case 50: return pXSect->Underwater; case 50: return pXSect->Underwater;
case 51: return condCmpr(pXSect->data, arg1, arg2); case 51: return condCmpr(pXSect->data, arg1, arg2);
// 52 // 52
// 53 // 53
// 54 // 54
} }
return false;
} else { } else {
switch (cond) { switch (cond) {
default: return false;
case 51: case 51:
return (!arg1 && !arg2); return (!arg1 && !arg2);
} }
return false;
} }
ThrowError("\nSector conditions: Unexpected condition id (%d)!", cond); ThrowError("\nSector conditions: Unexpected condition id (%d)!", cond);
@ -2249,6 +2270,7 @@ bool condCheckWall(XSPRITE* pXCond, bool PUSH, bool RVRS) {
if (cond < (kCondRange >> 1)) { if (cond < (kCondRange >> 1)) {
switch (cond) { switch (cond) {
default: return false;
case 0: return condCmpr(pWall->picnum, arg1, arg2); case 0: return condCmpr(pWall->picnum, arg1, arg2);
case 1: return condCmpr(pWall->overpicnum, arg1, arg2); case 1: return condCmpr(pWall->overpicnum, arg1, arg2);
case 2: return condCmpr((!arg3) ? pWall->xrepeat : pWall->xpanning, arg1, arg2); case 2: return condCmpr((!arg3) ? pWall->xrepeat : pWall->xpanning, arg1, arg2);
@ -2269,28 +2291,108 @@ bool condCheckWall(XSPRITE* pXCond, bool PUSH, bool RVRS) {
if (!condCmpr((var = sectorofwall(objIndex)), arg1, arg2)) return false; if (!condCmpr((var = sectorofwall(objIndex)), arg1, arg2)) return false;
else if (PUSH) condPush(pXCond, OBJ_SECTOR, var); else if (PUSH) condPush(pXCond, OBJ_SECTOR, var);
return true; return true;
case 12: // this wall is a mirror? // must be as constants here
return (pWall->type != kWallStack && condCmpr(pWall->picnum, 4080, (4080 + 16) - 1));
case 13: // next wall belongs to sector?
if (!sectRangeIsFine(var = sectorofwall(pWall->nextwall))) return false;
else if (PUSH) condPush(pXCond, OBJ_SECTOR, var);
return true;
} }
return false;
} else if (pXWall) { } else if (pXWall) {
switch (cond) { switch (cond) {
default: return false;
case 51: return condCmpr(pXWall->data, arg1, arg2); case 51: return condCmpr(pXWall->data, arg1, arg2);
// 52 // 52
// 53 // 53
// 54 // 54
} }
return false;
} else { } else {
switch (cond) { switch (cond) {
default: return false;
case 51: case 51:
return (!arg1 && !arg2); return (!arg1 && !arg2);
} }
return false;
} }
ThrowError("\nWall conditions: Unexpected condition id (%d)!", cond); ThrowError("\nWall conditions: Unexpected condition id (%d)!", cond);
return false; return false;
} }
bool condCheckDude(XSPRITE* pXCond, bool PUSH, bool RVRS) {
int var = -1; PLAYER* pPlayer = NULL;
int cond = pXCond->data1 - kCondDudeBase; int arg1 = pXCond->data2;
int arg2 = pXCond->data3; int arg3 = pXCond->data4;
int objType = pXCond->targetX; int objIndex = pXCond->targetY;
if (objType != OBJ_SPRITE || !spriRangeIsFine(objIndex))
ThrowError("\nDude conditions:\nObject #%d (objType: %d) is not a dude!", objType, objIndex);
spritetype* pSpr = &sprite[objIndex]; XSPRITE* pXSpr = NULL;
if (xspriRangeIsFine(pSpr->extra)) pXSpr = &xsprite[pSpr->extra];
else ThrowError("\nDude conditions:\nObject #%d (objType: %d) is not a dude! (extra out of range)", objType, objIndex);
if (pXSpr->health <= 0 || pSpr->type == kThingBloodChunks) return false;
else if (cond < (kCondRange >> 1)) {
if ((pPlayer = getPlayerById(pSpr->type)) == NULL)
ThrowError("\nDude conditions:\nObject #%d (objType: %d) is not a player!", objType, objIndex);
pSpr = pPlayer->pSprite; pXSpr = pPlayer->pXSprite;
switch (cond) {
default: break;
case 0: return (pPlayer->lifeMode == arg1);
case 1: return (pPlayer->posture == arg1);
case 2: return (arg1 > 0 && arg1 < 8 && pPlayer->hasKey[arg1 - 1]);
case 3: return (arg1 > 0 && arg1 < 15 && pPlayer->hasWeapon[arg1 - 1]);
case 4: return (pPlayer->curWeapon == arg1);
case 5: return (arg1 > 0 && arg1 < 6 && pPlayer->packSlots[arg1 - 1].curAmount > 0);
case 6: return (arg1 > 0 && arg1 < 6 && pPlayer->packSlots[arg1 - 1].isActive);
case 7: return (pPlayer->packItemId == arg1);
// 8
// 9
case 10: // check keys pressed
switch (arg1) {
case 1: return (pPlayer->input.forward > 0); // forward
case 2: return (pPlayer->input.forward < 0); // backward
case 3: return (pPlayer->input.strafe > 0); // left
case 4: return (pPlayer->input.strafe < 0); // right
case 5: return (pPlayer->input.buttonFlags.jump); // jump
case 6: return (pPlayer->input.buttonFlags.crouch); // crouch
case 7: return (pPlayer->input.buttonFlags.shoot); // normal fire weapon
case 8: return (pPlayer->input.buttonFlags.shoot2); // alt fire weapon
default:
ThrowError("\nDude conditions:\nSpecify a key!");
break;
}
return false;
case 11: return (pPlayer->isRunning);
case 12: return (pPlayer->fallScream); // falling in abyss?
// ......
case 46: return condCmpr(pPlayer->sceneQav >= 0, arg1, arg2);
case 47: return pPlayer->godMode;
case 48: return isShrinked(pSpr);
case 49: return isGrown(pSpr);
}
} else if (IsDudeSprite(pSpr)) {
switch (cond) {
default: break;
case 50: // dude have any targets?
if (!spriRangeIsFine(pXSpr->target)) return false;
else if (PUSH) condPush(pXCond, OBJ_SPRITE, pXSpr->target);
return true;
case 51: return aiFightDudeIsAffected(pXSpr); // dude affected by ai fight?
}
} else {
ThrowError("\nDude conditions:\nObject #%d (objType: %d) is not an enemy!", objType, objIndex);
}
ThrowError("\nDude conditions:\nUnexpected condition #%d!", cond);
return false;
}
bool condCheckSprite(XSPRITE* pXCond, bool PUSH, bool RVRS) { bool condCheckSprite(XSPRITE* pXCond, bool PUSH, bool RVRS) {
int var = -1; PLAYER* pPlayer = NULL; int var = -1; PLAYER* pPlayer = NULL;
@ -2305,8 +2407,8 @@ bool condCheckSprite(XSPRITE* pXCond, bool PUSH, bool RVRS) {
XSPRITE* pXSpr = (xspriRangeIsFine(pSpr->extra)) ? &xsprite[pSpr->extra] : NULL; XSPRITE* pXSpr = (xspriRangeIsFine(pSpr->extra)) ? &xsprite[pSpr->extra] : NULL;
if (cond < (kCondRange >> 1)) { if (cond < (kCondRange >> 1)) {
switch (cond) { switch (cond) {
default: return false;
case 0: return condCmpr(pSpr->picnum, arg1, arg2); case 0: return condCmpr(pSpr->picnum, arg1, arg2);
case 1: return condCmpr(pSpr->statnum, arg1, arg2); case 1: return condCmpr(pSpr->statnum, arg1, arg2);
case 2: return condCmpr(pSpr->xrepeat, arg1, arg2); case 2: return condCmpr(pSpr->xrepeat, arg1, arg2);
@ -2316,12 +2418,12 @@ bool condCheckSprite(XSPRITE* pXCond, bool PUSH, bool RVRS) {
case 6: return (pSpr->flags & arg1); case 6: return (pSpr->flags & arg1);
case 7: return (pSpr->cstat & arg1); case 7: return (pSpr->cstat & arg1);
case 8: case 8:
if (!condCmpr(pSpr->owner, arg1, arg2)) return false; if (!spriRangeIsFine(pSpr->owner)) return false;
else if (PUSH) condPush(pXCond, OBJ_SPRITE, pSpr->owner); else if (PUSH) condPush(pXCond, OBJ_SPRITE, pSpr->owner);
return false; return true;
case 9: return condCmpr(pSpr->shade, arg1, arg2); case 9: return condCmpr(pSpr->shade, arg1, arg2);
case 10: // stays in required sector? case 10: // stays in a sector?
if (!condCmpr(pSpr->sectnum, arg1, arg2)) return false; if (!sectRangeIsFine(pSpr->sectnum)) return false;
else if (PUSH) condPush(pXCond, OBJ_SECTOR, pSpr->sectnum); else if (PUSH) condPush(pXCond, OBJ_SECTOR, pSpr->sectnum);
return true; return true;
case 11: return condCmpr(pSpr->clipdist, arg1, arg2); case 11: return condCmpr(pSpr->clipdist, arg1, arg2);
@ -2333,14 +2435,9 @@ bool condCheckSprite(XSPRITE* pXCond, bool PUSH, bool RVRS) {
// 17 // 17
// 18 // 18
case 19: case 19:
if (!spriteIsUnderwater(pSpr)) return false; if (!spriteIsUnderwater(pSpr) && !spriteIsUnderwater(pSpr, true)) return false;
else if (PUSH) condPush(pXCond, OBJ_SECTOR, pSpr->sectnum); else if (PUSH) condPush(pXCond, OBJ_SECTOR, pSpr->sectnum);
return true; return true;
case 20: // sprite is in water sector, but not underwater?
if (spriteIsUnderwater(pSpr)) return false;
// .....
// .....
return true;
case 34: // hitscan: ceil? case 34: // hitscan: ceil?
case 35: // hitscan: floor? case 35: // hitscan: floor?
case 36: // hitscan: wall? case 36: // hitscan: wall?
@ -2360,41 +2457,49 @@ bool condCheckSprite(XSPRITE* pXCond, bool PUSH, bool RVRS) {
else else
var = HitScan(pSpr, pSpr->z, Cos(pSpr->ang) >> 16, Sin(pSpr->ang) >> 16, 0, arg1, arg3 << 1); var = HitScan(pSpr, pSpr->z, Cos(pSpr->ang) >> 16, Sin(pSpr->ang) >> 16, 0, arg1, arg3 << 1);
if (var >= 0 && var <= 4) { switch (cond) {
if (((cond == 34) ^ RVRS) && var == 1) { case 34:
if (PUSH) condPush(pXCond, OBJ_SECTOR, gHitInfo.hitsect); if (var != 1) return false;
else if (PUSH) condPush(pXCond, OBJ_SECTOR, gHitInfo.hitsect);
return true; return true;
} else if (((cond == 35) ^ RVRS) && var == 2) { case 35:
if (PUSH) condPush(pXCond, OBJ_SECTOR, gHitInfo.hitsect); if (var != 2) return false;
else if (PUSH) condPush(pXCond, OBJ_SECTOR, gHitInfo.hitsect);
return true; return true;
} else if (((cond == 36) ^ RVRS) && (var == 0 || var == 4)) { case 36:
if (PUSH) condPush(pXCond, OBJ_WALL, gHitInfo.hitwall); if (var != 0 && var != 4) return false;
else if (PUSH) condPush(pXCond, OBJ_WALL, gHitInfo.hitwall);
return true; return true;
} else if (((cond == 37) ^ RVRS) && var == 3) { case 37:
if (PUSH) condPush(pXCond, OBJ_SPRITE, gHitInfo.hitsprite); if (var != 3) return false;
else if (PUSH) condPush(pXCond, OBJ_SPRITE, gHitInfo.hitsprite);
return true; return true;
} }
}
return false; return false;
case 38: case 38: // check for proximity
arg3 = ClipRange(arg3, 48, 512); arg3 = ClipRange(arg3, 48, 512);
for (int i = 0, num = 0; i < kMaxSprites; i++) { for (int i = 0, num = 0; i < kMaxSprites; i++) {
if (sprite[i].statnum == kStatFree || (sprite[i].flags & kHitagFree) || !condCmpr(sprite[i].type, arg1, arg2)) continue; if (sprite[i].statnum == kStatFree || (sprite[i].flags & kHitagFree) || !condCmpr(sprite[i].type, arg1, arg2)) continue;
else if (CheckProximity(&sprite[i], pSpr->x, pSpr->y, pSpr->z, pSpr->sectnum, arg3)) { else if (num++ > Numsprites) break;
if (PUSH) condPush(pXCond, OBJ_SPRITE, i);
int oX = klabs(pSpr->x - sprite[i].x) >> 4;
if (oX > arg3) continue;
int oY = klabs(pSpr->y - sprite[i].y) >> 4;
if (oY > arg3) continue;
int oZ = klabs(pSpr->z - sprite[i].z) >> 8;
if (oZ > arg3) continue;
if (approxDist(oX, oY) > arg3) continue;
else if (PUSH) condPush(pXCond, OBJ_SPRITE, i);
return true; return true;
} }
if (num++ >= Numsprites) break;
}
return false; return false;
} }
return false;
} else if (pXSpr) { } else if (pXSpr) {
switch (cond) { switch (cond) {
default: return false;
case 50: return ((!arg1 && !arg2 && pSpr->type == kThingBloodChunks) ? true : condCmpr(pXSpr->health, arg1, arg2)); case 50: return ((!arg1 && !arg2 && pSpr->type == kThingBloodChunks) ? true : condCmpr(pXSpr->health, arg1, arg2));
case 51: return condCmpr(pXSpr->data1, arg1, arg2); case 51: return condCmpr(pXSpr->data1, arg1, arg2);
case 52: return condCmpr(pXSpr->data2, arg1, arg2); case 52: return condCmpr(pXSpr->data2, arg1, arg2);
@ -2459,22 +2564,16 @@ bool condCheckSprite(XSPRITE* pXCond, bool PUSH, bool RVRS) {
return true; return true;
} }
return false; return false;
case 75: return aiFightDudeIsAffected(pXSpr); // dude affected by ai fight?
case 76: // sprite is set on fire? case 76: // sprite is set on fire?
if (!condCmpr(pXSpr->burnTime, arg1, arg2)) return false; if (!condCmpr(pXSpr->burnTime, arg1, arg2)) return false;
else if (PUSH) condPush(pXCond, OBJ_SPRITE, pXSpr->burnSource); else if (PUSH) condPush(pXCond, OBJ_SPRITE, pXSpr->burnSource);
return true; return true;
case 77: // target of sprite equals to ....? case 79:
if (pXSpr->target < 0) return false; return condCmpr(getSpriteMassBySize(pSpr), arg1, arg2); // mass of the sprite in a range?
else if (PUSH) condPush(pXCond, OBJ_SPRITE, pXSpr->target);
return true;
case 79: return condCmpr(getSpriteMassBySize(pSpr), arg1, arg2); // mass of the sprite in a range?
} }
return false;
} else { } else {
switch (cond) { switch (cond) {
default: return false;
case 50: case 50:
case 51: case 51:
case 52: case 52:
@ -2483,8 +2582,6 @@ bool condCheckSprite(XSPRITE* pXCond, bool PUSH, bool RVRS) {
case 76: case 76:
return (!arg1 && !arg2); return (!arg1 && !arg2);
} }
return false;
} }
ThrowError("\nSprite conditions: Unexpected condition id (%d)!", cond); ThrowError("\nSprite conditions: Unexpected condition id (%d)!", cond);
@ -2966,7 +3063,7 @@ bool modernTypeOperateSprite(int nSprite, spritetype* pSprite, XSPRITE* pXSprite
break; break;
case kCmdOn: case kCmdOn:
if (!pXSprite->state) SetSpriteState(nSprite, pXSprite, 1); if (!pXSprite->state) SetSpriteState(nSprite, pXSprite, 1);
if (IsPlayerSprite(pSprite)) break; if (IsPlayerSprite(pSprite) || pXSprite->health <= 0) break;
switch (pXSprite->aiState->stateType) { switch (pXSprite->aiState->stateType) {
case kAiStateIdle: case kAiStateIdle:
case kAiStateGenIdle: case kAiStateGenIdle:
@ -3639,16 +3736,18 @@ void useCondition(XSPRITE* pXSource, EVENT event) {
int cond = pXSource->data1; bool ok = false; int cond = pXSource->data1; bool ok = false;
bool PUSH = (pXSource->command == kCmdNumberic); bool RVRS = (pSource->yvel == kModernConditionFalse); bool PUSH = (pXSource->command == kCmdNumberic); bool RVRS = (pSource->yvel == kModernConditionFalse);
bool RSTR = (pXSource->command == kCmdNumberic + 26);
if (cond == 0) ok = true; if (condCmpr(cond, kCondMixedBase, kCondMixedMax)) ok = condCheckMixed(pXSource, event, PUSH, RVRS);
else if (condCmpr(cond, kCondMixedBase, kCondMixedMax)) ok = condCheckMixed(pXSource, event, PUSH, RVRS);
else if (condCmpr(cond, kCondWallBase, kCondWallMax)) ok = condCheckWall(pXSource, PUSH, RVRS); else if (condCmpr(cond, kCondWallBase, kCondWallMax)) ok = condCheckWall(pXSource, PUSH, RVRS);
else if (condCmpr(cond, kCondSectorBase, kCondSectorMax)) ok = condCheckSector(pXSource, PUSH, RVRS); else if (condCmpr(cond, kCondSectorBase, kCondSectorMax)) ok = condCheckSector(pXSource, PUSH, RVRS);
else if (condCmpr(cond, kCondDudeBase, kCondDudeMax)) ok = condCheckDude(pXSource, PUSH, RVRS);
else if (condCmpr(cond, kCondSpriteBase, kCondSpriteMax)) ok = condCheckSprite(pXSource, PUSH, RVRS); else if (condCmpr(cond, kCondSpriteBase, kCondSpriteMax)) ok = condCheckSprite(pXSource, PUSH, RVRS);
else ThrowError("\nUnexpected condition id %d!\n Condition RX ID: %d, SPRITE #%d", cond, pXSource->rxID, pSource->index); else ThrowError("\nUnexpected condition id %d!\n Condition RX ID: %d, SPRITE #%d", cond, pXSource->rxID, pSource->index);
if (ok ^ RVRS) { if (ok ^ RVRS) {
//viewSetSystemMessage("TRIGGER COND: %d, RVRS: %d", cond, RVRS); //viewSetSystemMessage("TRIGGER COND: %d, RVRS: %d", cond, RVRS);
if (RSTR) condRestore(pXSource);
if (pXSource->triggerOnce) pXSource->isTriggered = true; if (pXSource->triggerOnce) pXSource->isTriggered = true;
if (pSource->flags & kModernTypeFlag1) evPost(chkObjIndex, chkObjType, 0, (COMMAND_ID)pXSource->command); // send it only for object that pass condition if (pSource->flags & kModernTypeFlag1) evPost(chkObjIndex, chkObjType, 0, (COMMAND_ID)pXSource->command); // send it only for object that pass condition
else evSend(pXSource->reference, OBJ_SPRITE, pXSource->txID, (COMMAND_ID)pXSource->command); // send it for whole rx bucket else evSend(pXSource->reference, OBJ_SPRITE, pXSource->txID, (COMMAND_ID)pXSource->command); // send it for whole rx bucket

2
source/blood/src/nnexts.h
View file

@ -123,6 +123,8 @@ kCondWallBase = 200,
kCondWallMax = 299, kCondWallMax = 299,
kCondSectorBase = 300, kCondSectorBase = 300,
kCondSectorMax = 399, kCondSectorMax = 399,
kCondDudeBase = 400,
kCondDudeMax = 499,
kCondSpriteBase = 500, kCondSpriteBase = 500,
kCondSpriteMax = 599, kCondSpriteMax = 599,
}; };