Digitalstack/SabrehavenServer
2
0
Fork 0
mirror of https://github.com/ErikasKontenis/SabrehavenServer.git synced 2025-12-25 10:27:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix poison condition to be applied from poison monsters only when you can't block it porperly"

Browse Source 
This reverts commit dca9e61345.
This commit is contained in:
ErikasKontenis
2020-03-13 21:52:32 +02:00
parent 5a007594d5
commit fa636a5f99
3 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/creature.cpp
View File

@@ -825,23 +825,6 @@ BlockType_t Creature::blockHit(Creature* attacker, CombatType_t combatType, int3
if (attacker) {
attacker->onAttackedCreature(this);
attacker->onAttackedCreatureBlockHit(blockType);
if (Monster* monster = attacker->getMonster()) {
int32_t poison = monster->mType->info.poison;
if (poison) {
if (blockType == BLOCK_NONE || blockType == BLOCK_ARMOR) {
poison = normal_random(poison / 2, poison);
if (poison) {
ConditionDamage* condition = static_cast<ConditionDamage*>(Condition::createCondition(CONDITIONID_COMBAT, CONDITION_POISON, 0, 0));
condition->setParam(CONDITION_PARAM_OWNER, attacker->getID());
condition->setParam(CONDITION_PARAM_CYCLE, poison);
condition->setParam(CONDITION_PARAM_COUNT, 3);
condition->setParam(CONDITION_PARAM_MAX_COUNT, 3);
addCombatCondition(condition);
}
}
}
}
}
onAttacked();