mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
* support for orb of vulnerability
* updated changelog
This commit is contained in:
parent
76f61fa09e
commit
6541e89f90
10
ChangeLog
10
ChangeLog
@ -2,7 +2,15 @@
|
|||||||
GENERAL:
|
GENERAL:
|
||||||
* It's possible to start campaign
|
* It's possible to start campaign
|
||||||
* Support for build grail victory condition
|
* Support for build grail victory condition
|
||||||
* New artifacts supported: Angel's Wings and Boots of levitation
|
* New artifacts supported:
|
||||||
|
- Angel's Wings
|
||||||
|
- Boots of levitation
|
||||||
|
- Orb of Vulnerability
|
||||||
|
- Ammo cart
|
||||||
|
- Golden Bow
|
||||||
|
- Hourglass of Evil Hour
|
||||||
|
- Bow of Sharpshooter
|
||||||
|
- Armor of the Damned
|
||||||
|
|
||||||
ADVENTURE MAP:
|
ADVENTURE MAP:
|
||||||
* Creatures now guard surrounding tiles
|
* Creatures now guard surrounding tiles
|
||||||
|
@ -3598,18 +3598,22 @@ static std::vector<ui32> calculateResistedStacks(const CSpell * sp, const CGHero
|
|||||||
if (caster->hasBonusOfType(Bonus::NEGATE_ALL_NATURAL_IMMUNITIES) ||
|
if (caster->hasBonusOfType(Bonus::NEGATE_ALL_NATURAL_IMMUNITIES) ||
|
||||||
hero2->hasBonusOfType(Bonus::NEGATE_ALL_NATURAL_IMMUNITIES))
|
hero2->hasBonusOfType(Bonus::NEGATE_ALL_NATURAL_IMMUNITIES))
|
||||||
{
|
{
|
||||||
//Here we need "source different than" selector
|
//don't use natural immunities when one of heroes has this bonus
|
||||||
// BonusList bl = (*it)->getBonuses(Selector::sourceNotType(Bonus::CREATURE_ABILITY));
|
BonusList bl = (*it)->getBonuses(Selector::type(Bonus::SPELL_IMMUNITY)),
|
||||||
//
|
b2 = (*it)->getBonuses(Selector::type(Bonus::LEVEL_SPELL_IMMUNITY));
|
||||||
// BOOST_FOREACH(Bonus bb, bl)
|
|
||||||
// {
|
bl.insert(bl.end(), b2.begin(), b2.end());
|
||||||
// if(bb.type == Bonus::SPELL_IMMUNITY && bb.subtype == sp->id || //100% sure spell immunity
|
|
||||||
// bb.type == Bonus::LEVEL_SPELL_IMMUNITY && bb.val >= sp->level) //some creature abilities have level 0
|
BOOST_FOREACH(Bonus bb, bl)
|
||||||
// {
|
{
|
||||||
// ret.push_back((*it)->ID);
|
if( (bb.type == Bonus::SPELL_IMMUNITY && bb.subtype == sp->id || //100% sure spell immunity
|
||||||
// continue;
|
bb.type == Bonus::LEVEL_SPELL_IMMUNITY && bb.val >= sp->level) //some creature abilities have level 0
|
||||||
// }
|
&& bb.source != Bonus::CREATURE_ABILITY)
|
||||||
// }
|
{
|
||||||
|
ret.push_back((*it)->ID);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user