Digitalstack/SabrehavenServer
2
0
Fork 0
mirror of https://github.com/ErikasKontenis/SabrehavenServer.git synced 2025-04-30 01:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix monsters to not walk on fields when aggresive if they cannot push items

Browse Source
This commit is contained in:
ErikasKontenis 2020-11-22 14:07:52 +02:00
parent 7e37b2c935
commit 618bb6917b
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tile.cpp
View File

@ -521,6 +521,20 @@ ReturnValue Tile::queryAdd(int32_t, const Thing& thing, uint32_t, uint32_t flags
} }
} }
if (monster->hasCondition(CONDITION_AGGRESSIVE) && !monster->canPushItems()) {
if (hasFlag(TILESTATE_FIREDAMAGE) && !monster->isImmune(COMBAT_FIREDAMAGE)) {
return RETURNVALUE_NOTPOSSIBLE;
}
if (hasFlag(TILESTATE_POISONDAMAGE) && !monster->isImmune(COMBAT_EARTHDAMAGE)) {
return RETURNVALUE_NOTPOSSIBLE;
}
if (hasFlag(TILESTATE_ENERGYDAMAGE) && !monster->isImmune(COMBAT_ENERGYDAMAGE)) {
return RETURNVALUE_NOTPOSSIBLE;
}
}
if (!monster->hasCondition(CONDITION_AGGRESSIVE) && if (!monster->hasCondition(CONDITION_AGGRESSIVE) &&
!hasBitSet(FLAG_IGNOREFIELDDAMAGE, flags)) { !hasBitSet(FLAG_IGNOREFIELDDAMAGE, flags)) {
if (hasFlag(TILESTATE_FIREDAMAGE) && !monster->isImmune(COMBAT_FIREDAMAGE)) { if (hasFlag(TILESTATE_FIREDAMAGE) && !monster->isImmune(COMBAT_FIREDAMAGE)) {