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

Merge pull request #1486 from IvanSavenko/configurable_rewardables

Browse Source 
Well, it works for my brand new objects with arbitrary bonus, so likely will work with everything else.
This commit is contained in:
DjWarmonger
2023-01-26 17:01:01 +01:00
committed by GitHub
parent 54537fc02c 7a9e5e4e30
commit 25ef065dbe
28 changed files with 2038 additions and 1822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/mapObjects/MiscObjects.cpp
View File

@@ -1523,32 +1523,6 @@ void CGWitchHut::serializeJsonOptions(JsonSerializeFormat & handler)
}
}
void CGMagicWell::onHeroVisit( const CGHeroInstance * h ) const
{
int message;
if(h->hasBonusFrom(Bonus::OBJECT,ID)) //has already visited Well today
{
message = 78;//"A second drink at the well in one day will not help you."
}
else if(h->mana < h->manaLimit())
{
giveDummyBonus(h->id);
cb->setManaPoints(h->id,h->manaLimit());
message = 77;
}
else
{
message = 79;
}
showInfoDialog(h, message);
}
std::string CGMagicWell::getHoverText(const CGHeroInstance * hero) const
{
return getObjectName() + " " + visitedTxt(hero->hasBonusFrom(Bonus::OBJECT,ID));
}
void CGObservatory::onHeroVisit( const CGHeroInstance * h ) const
{
InfoWindow iw;