games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

-Resolved #345

Browse Source 
-Fixes for give experience reward and belong to player text
This commit is contained in:
DjWarmonger
2010-02-14 06:53:37 +00:00
parent 78f54ffcd3
commit 415266279e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hch/CObjectHandler.cpp
View File

@@ -2141,7 +2141,7 @@ void COPWBonus::onHeroVisit (const CGHeroInstance * h) const
switch (town->subID) switch (town->subID)
{ {
case 0: //Stables case 0: //Stables
if (!h->getBonus(HeroBonus::OBJECT, 94)) //no advMap Stables if (!h->getBonus(HeroBonus::OBJECT, 94)) //does not stack with advMap Stables
{ {
GiveBonus gb; GiveBonus gb;
gb.bonus = HeroBonus(HeroBonus::ONE_WEEK, HeroBonus::LAND_MOVEMENT, HeroBonus::OBJECT, 600, 94, VLC->generaltexth->arraytxt[100]); gb.bonus = HeroBonus(HeroBonus::ONE_WEEK, HeroBonus::LAND_MOVEMENT, HeroBonus::OBJECT, 600, 94, VLC->generaltexth->arraytxt[100]);
@@ -3536,6 +3536,10 @@ void CGSeerHut::onHeroVisit( const CGHeroInstance * h ) const
bd.text.addReplacement (VLC->generaltexth->arraytxt[147+checkDirection()]); bd.text.addReplacement (VLC->generaltexth->arraytxt[147+checkDirection()]);
} }
} }
case MISSION_PLAYER:
bd.components.push_back (Component (Component::FLAG, m13489val, 0, 0));
bd.text.addReplacement (VLC->generaltexth->colors[m13489val]);
break;
} }
cb->showBlockingDialog (&bd, boost::bind (&CGSeerHut::finishQuest, this, h, _1)); cb->showBlockingDialog (&bd, boost::bind (&CGSeerHut::finishQuest, this, h, _1));
return; return;
@@ -3615,7 +3619,7 @@ void CGSeerHut::completeQuest (const CGHeroInstance * h) const //reward
switch (rewardType) switch (rewardType)
{ {
case 1: //experience case 1: //experience
cb->changePrimSkill(h->id, 5, rVal, false); cb->changePrimSkill(h->id, 4, rVal, false);
iw.components.push_back (Component (Component::EXPERIENCE, 0, rVal, 0)); iw.components.push_back (Component (Component::EXPERIENCE, 0, rVal, 0));
break; break;
case 2: //mana points case 2: //mana points
@@ -3866,6 +3870,8 @@ void CGBonusingObject::onHeroVisit( const CGHeroInstance * h ) const
messageID = 137; messageID = 137;
gbonus.bonus.type = HeroBonus::LAND_MOVEMENT; gbonus.bonus.type = HeroBonus::LAND_MOVEMENT;
gbonus.bonus.val = 600; gbonus.bonus.val = 600;
bonusMove = 600;
gbonus.bonus.duration = HeroBonus::ONE_WEEK;
gbonus.bdescr << std::pair<ui8,ui32>(6, 100); gbonus.bdescr << std::pair<ui8,ui32>(6, 100);
break; break;
} }
@@ -3883,7 +3889,7 @@ void CGBonusingObject::onHeroVisit( const CGHeroInstance * h ) const
if(gbonus.bonus.type == HeroBonus::LUCK || gbonus.bonus.type == HeroBonus::MORALE_AND_LUCK) if(gbonus.bonus.type == HeroBonus::LUCK || gbonus.bonus.type == HeroBonus::MORALE_AND_LUCK)
iw.components.push_back(Component(9,0,gbonus.bonus.val,0)); iw.components.push_back(Component(9,0,gbonus.bonus.val,0));
cb->giveHeroBonus(&gbonus); cb->giveHeroBonus(&gbonus);
if(bonusMove) //swan pond - take all move points if(bonusMove) //swan pond - take all move points, stables - give move point this day
{ {
SetMovePoints smp; SetMovePoints smp;
smp.hid = h->id; smp.hid = h->id;