games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

- Parsing propagators and limiters

Browse Source 
- Experimental support for chaining limiters
- Added missing abilities, propagators and limiters to artifacts
- Sketch of Calculator for bonuses, ignore it for now
This commit is contained in:
DjWarmonger
2013-01-16 13:02:01 +00:00
parent 53b684180d
commit d7c9377843
5 changed files with 1348 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/HeroBonus.cpp
View File

@@ -65,7 +65,8 @@ const bmap<std::string, TLimiterPtr> bonusLimiterMap = boost::assign::map_list_o
const bmap<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));
("VISITED_TOWN_AND_VISITOR", make_shared<CPropagatorNodeType>(CBonusSystemNode::TOWN_AND_VISITOR))
("PLAYER_PROPAGATOR", make_shared<CPropagatorNodeType>(CBonusSystemNode::PLAYER));
#define BONUS_LOG_LINE(x) tlog5 << x << std::endl
@@ -95,6 +96,7 @@ BonusList& BonusList::operator=(const BonusList &bonusList)
int BonusList::totalValue() const
{
int tempVal = 0;
int base = 0;
int percentToBase = 0;
int percentToAll = 0;
@@ -108,6 +110,15 @@ int BonusList::totalValue() const
{
Bonus *b = bonuses[i];
if (b->calculator)
{
assert (false);
BonusCalculationContext bcc = {b, CBonusSystemNode()};
tempVal = b->calculator->val (bcc);
}
else
tempVal = b->val;
switch(b->valType)
{
case Bonus::BASE_NUMBER:
@@ -1156,12 +1167,6 @@ Bonus::~Bonus()
{
}
Bonus * Bonus::addLimiter(TLimiterPtr Limiter)
{
limiter = Limiter;
return this;
}
Bonus * Bonus::addPropagator(TPropagatorPtr Propagator)
{
propagator = Propagator;
@@ -1314,6 +1319,21 @@ DLL_LINKAGE std::ostream & operator<<(std::ostream &out, const Bonus &bonus)
return out;
}
Bonus * Bonus::addLimiter(TLimiterPtr Limiter)
{
if (next) //insert at the beginning of list
{
TLimiterPtr temp = next;
next = Limiter;
next->next = temp;
}
else
{
next = Limiter;
}
return this;
}
int LimiterDecorator::limit(const BonusLimitationContext &context) const /*return true to drop the bonus */
{