games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-11 01:10:26 +02:00
Code Issues Releases Activity

Fixed some missing elements, mostly messages

Browse Source
This commit is contained in:
Ivan Savenko
2014-04-12 14:35:48 +03:00
parent ba5092d669
commit a4e7987835
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/CObjectWithReward.cpp
View File

@ -598,15 +598,13 @@ void CGBonusingObject::initObj()
soundID = sound; soundID = sound;
}; };
if(ID == Obj::BUOY || ID == Obj::MERMAID)
blockVisit = true;
info.resize(1); info.resize(1);
CVisitInfo & visit = info[0]; CVisitInfo & visit = info[0];
switch(ID) switch(ID)
{ {
case Obj::BUOY: case Obj::BUOY:
blockVisit = true;
configureMessage(visit, 21, 22, soundBase::MORALE); configureMessage(visit, 21, 22, soundBase::MORALE);
configureBonus(visit, Bonus::MORALE, +1, 94); configureBonus(visit, Bonus::MORALE, +1, 94);
break; break;
@ -621,26 +619,30 @@ void CGBonusingObject::initObj()
break; break;
case Obj::FOUNTAIN_OF_FORTUNE: case Obj::FOUNTAIN_OF_FORTUNE:
selectMode = SELECT_RANDOM; selectMode = SELECT_RANDOM;
configureMessage(visit, 55, 56, soundBase::LUCK);
info.resize(5); info.resize(5);
for (int i=0; i<5; i++) for (int i=0; i<5; i++)
{
configureBonus(info[i], Bonus::LUCK, i-1, 69); //NOTE: description have %d that should be replaced with value configureBonus(info[i], Bonus::LUCK, i-1, 69); //NOTE: description have %d that should be replaced with value
configureMessage(info[i], 55, 56, soundBase::LUCK);
}
break; break;
case Obj::IDOL_OF_FORTUNE: case Obj::IDOL_OF_FORTUNE:
configureMessage(visit, 62, 63, soundBase::experience);
info.resize(7); info.resize(7);
for (int i=0; i<6; i++) for (int i=0; i<6; i++)
{ {
info[i].limiter.dayOfWeek = i+1; info[i].limiter.dayOfWeek = i+1;
configureBonus(info[i], i%2 ? Bonus::MORALE : Bonus::LUCK, 1, 68); configureBonus(info[i], i%2 ? Bonus::MORALE : Bonus::LUCK, 1, 68);
configureMessage(info[i], 62, 63, soundBase::experience);
} }
info.back().limiter.dayOfWeek = 7; info.back().limiter.dayOfWeek = 7;
configureBonus(info.back(), Bonus::MORALE, 1, 68); // on last day of week configureBonus(info.back(), Bonus::MORALE, 1, 68); // on last day of week
configureBonus(info.back(), Bonus::LUCK, 1, 68); configureBonus(info.back(), Bonus::LUCK, 1, 68);
configureMessage(info.back(), 62, 63, soundBase::experience);
break; break;
case Obj::MERMAID: case Obj::MERMAID:
blockVisit = true;
configureMessage(visit, 83, 82, soundBase::LUCK); configureMessage(visit, 83, 82, soundBase::LUCK);
configureBonus(visit, Bonus::LUCK, 1, 72); configureBonus(visit, Bonus::LUCK, 1, 72);
break; break;
@ -725,7 +727,6 @@ void CGOnceVisitable::initObj()
} }
} }
break; break;
case Obj::LEAN_TO: case Obj::LEAN_TO:
{ {
soundID = soundBase::GENIE; soundID = soundBase::GENIE;
@ -737,7 +738,6 @@ void CGOnceVisitable::initObj()
info[0].message.addTxt(MetaString::ADVOB_TXT, 64); info[0].message.addTxt(MetaString::ADVOB_TXT, 64);
} }
break; break;
case Obj::WARRIORS_TOMB: case Obj::WARRIORS_TOMB:
{ {
soundID = soundBase::GRAVEYARD; soundID = soundBase::GRAVEYARD;
@ -1015,7 +1015,13 @@ void CGVisitableOPW::initObj()
void CGMagicSpring::initObj() void CGMagicSpring::initObj()
{ {
CVisitInfo visit; // TODO: "player above max mana" limiter
visit.reward.manaPercentage = 200;
visit.message.addTxt(MetaString::ADVOB_TXT, 74);
info.push_back(visit); // two rewards, one for each entrance
info.push_back(visit);
onEmpty.addTxt(MetaString::ADVOB_TXT, 75);
soundID = soundBase::GENIE;
} }
std::vector<int3> CGMagicSpring::getVisitableOffsets() const std::vector<int3> CGMagicSpring::getVisitableOffsets() const