|
@@ -55,18 +55,18 @@ const std::map<std::string, ui16> bonusDurationMap = boost::assign::map_list_of
|
|
|
const std::map<std::string, Bonus::LimitEffect> bonusLimitEffect = boost::assign::map_list_of
|
|
|
BONUS_ITEM(NO_LIMIT)
|
|
|
BONUS_ITEM(ONLY_DISTANCE_FIGHT)
|
|
|
- BONUS_ITEM(ONLY_MELEE_FIGHT)
|
|
|
- BONUS_ITEM(ONLY_ENEMY_ARMY);
|
|
|
-
|
|
|
-const std::map<std::string, TLimiterPtr> bonusLimiterMap = boost::assign::map_list_of
|
|
|
- ("SHOOTER_ONLY", make_shared<HasAnotherBonusLimiter>(Bonus::SHOOTER))
|
|
|
- ("DRAGON_NATURE", make_shared<HasAnotherBonusLimiter>(Bonus::DRAGON_NATURE))
|
|
|
- ("IS_UNDEAD", make_shared<HasAnotherBonusLimiter>(Bonus::UNDEAD));
|
|
|
-
|
|
|
-const std::map<std::string, TPropagatorPtr> bonusPropagatorMap = boost::assign::map_list_of
|
|
|
- ("BATTLE_WIDE", make_shared<CPropagatorNodeType>(CBonusSystemNode::BATTLE))
|
|
|
- ("VISITED_TOWN_AND_VISITOR", make_shared<CPropagatorNodeType>(CBonusSystemNode::TOWN_AND_VISITOR))
|
|
|
- ("PLAYER_PROPAGATOR", make_shared<CPropagatorNodeType>(CBonusSystemNode::PLAYER))
|
|
|
+ BONUS_ITEM(ONLY_MELEE_FIGHT)
|
|
|
+ BONUS_ITEM(ONLY_ENEMY_ARMY);
|
|
|
+
|
|
|
+const std::map<std::string, TLimiterPtr> bonusLimiterMap = boost::assign::map_list_of
|
|
|
+ ("SHOOTER_ONLY", make_shared<HasAnotherBonusLimiter>(Bonus::SHOOTER))
|
|
|
+ ("DRAGON_NATURE", make_shared<HasAnotherBonusLimiter>(Bonus::DRAGON_NATURE))
|
|
|
+ ("IS_UNDEAD", make_shared<HasAnotherBonusLimiter>(Bonus::UNDEAD));
|
|
|
+
|
|
|
+const std::map<std::string, TPropagatorPtr> bonusPropagatorMap = boost::assign::map_list_of
|
|
|
+ ("BATTLE_WIDE", make_shared<CPropagatorNodeType>(CBonusSystemNode::BATTLE))
|
|
|
+ ("VISITED_TOWN_AND_VISITOR", make_shared<CPropagatorNodeType>(CBonusSystemNode::TOWN_AND_VISITOR))
|
|
|
+ ("PLAYER_PROPAGATOR", make_shared<CPropagatorNodeType>(CBonusSystemNode::PLAYER))
|
|
|
("HERO", make_shared<CPropagatorNodeType>(CBonusSystemNode::HERO))
|
|
|
("TEAM_PROPAGATOR", make_shared<CPropagatorNodeType>(CBonusSystemNode::TEAM)) //untested
|
|
|
("GLOBAL_EFFECT", make_shared<CPropagatorNodeType>(CBonusSystemNode::GLOBAL_EFFECTS)); //untested
|
|
@@ -1363,7 +1363,7 @@ int CCreatureTypeLimiter::limit(const BonusLimitationContext &context) const
|
|
|
if(!c)
|
|
|
return true;
|
|
|
return c != creature && (!includeUpgrades || !creature->isMyUpgrade(c));
|
|
|
- //drop bonus if it's not our creature and (we dont check upgrades or its not our upgrade)
|
|
|
+ //drop bonus if it's not our creature and (we don`t check upgrades or its not our upgrade)
|
|
|
}
|
|
|
|
|
|
CCreatureTypeLimiter::CCreatureTypeLimiter(const CCreature &Creature, bool IncludeUpgrades /*= true*/)
|