games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

Merge pull request #182 from vmarkovtsev/issue/1916

Browse Source 
Fix 1916 water wheel reward
This commit is contained in:
DjWarmonger
2016-01-30 18:00:37 +01:00
parent b0d9b8bf63 eb4331baf6
commit ab27464541
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/mapObjects/CRewardableObject.cpp
View File

@@ -422,7 +422,7 @@ void CRewardableObject::setPropertyDer(ui8 what, ui32 val)
void CRewardableObject::newTurn() const void CRewardableObject::newTurn() const
{ {
if (resetDuration != 0 && cb->getDate(Date::DAY) > 1 && cb->getDate(Date::DAY) % (resetDuration) == 1) if (resetDuration != 0 && cb->getDate(Date::DAY) > 1 && (cb->getDate(Date::DAY) % resetDuration) == 1)
cb->setObjProperty(id, ObjProperty::REWARD_RESET, 0); cb->setObjProperty(id, ObjProperty::REWARD_RESET, 0);
} }
@@ -1003,16 +1003,30 @@ void CGVisitableOPW::initObj()
soundID = soundBase::GENIE; soundID = soundBase::GENIE;
onEmpty.addTxt(MetaString::ADVOB_TXT, 165); onEmpty.addTxt(MetaString::ADVOB_TXT, 165);
info.resize(2); info.resize(1);
info[0].limiter.dayOfWeek = 7; // double amount on sunday info[0].reward.resources[Res::GOLD] = 500;
info[0].reward.resources[Res::GOLD] = 1000;
info[1].reward.resources[Res::GOLD] = 500;
info[0].message.addTxt(MetaString::ADVOB_TXT, 164); info[0].message.addTxt(MetaString::ADVOB_TXT, 164);
info[1].message.addTxt(MetaString::ADVOB_TXT, 164);
break; break;
} }
} }
void CGVisitableOPW::setPropertyDer(ui8 what, ui32 val)
{
if(ID == Obj::WATER_WHEEL && what == ObjProperty::REWARD_RESET)
{
auto& reward = info[0].reward.resources[Res::GOLD];
if(info[0].numOfGrants == 0)
{
reward = 1000;
}
else
{
reward = 500;
}
}
CRewardableObject::setPropertyDer(what, val);
}
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
void CGMagicSpring::initObj() void CGMagicSpring::initObj()

2
lib/mapObjects/CRewardableObject.h
View File

@@ -306,6 +306,8 @@ public:
CGVisitableOPW(); CGVisitableOPW();
void setPropertyDer(ui8 what, ui32 val) override;
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {
h & static_cast<CRewardableObject&>(*this); h & static_cast<CRewardableObject&>(*this);