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

Fix regression for week-visitable objects

Browse Source
This commit is contained in:
Piotr Wójcik 2016-09-28 19:07:48 +02:00 committed by AlexVinS
parent 6664731886
commit bb890098df
3 changed files with 62 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/NetPacksLib.cpp
View File

@ -323,7 +323,18 @@ DLL_LINKAGE void ChangeObjectVisitors::applyGs( CGameState *gs )
break;
case VISITOR_CLEAR:
for (CGHeroInstance * hero : gs->map->allHeroes)
hero->visitedObjects.erase(object); // remove visit info from all heroes, including those that are not present on map
{
if (hero)
{
hero->visitedObjects.erase(object); // remove visit info from all heroes, including those that are not present on map
}
}
for(auto &elem : gs->players)
{
elem.second.visitedObjects.erase(object);
}
break;
case VISITOR_REMOVE:
gs->getHero(hero)->visitedObjects.erase(object);

74
lib/mapObjects/CRewardableObject.cpp
View File

@ -1039,44 +1039,28 @@ void CGVisitableOPH::initObj(CRandomGenerator & rand)
CGVisitableOPW::CGVisitableOPW()
{
visitMode = VISIT_ONCE;
selectMode = SELECT_RANDOM;
resetDuration = 7;
}
void CGVisitableOPW::initObj(CRandomGenerator & rand)
{
setRandomReward(rand);
switch (ID)
{
case Obj::MYSTICAL_GARDEN:
soundID = soundBase::experience;
onEmpty.addTxt(MetaString::ADVOB_TXT, 93);
info.resize(2);
info[0].reward.resources[Res::GEMS] = 5;
info[1].reward.resources[Res::GOLD] = 500;
info[0].message.addTxt(MetaString::ADVOB_TXT, 92);
info[1].message.addTxt(MetaString::ADVOB_TXT, 92);
break;
case Obj::WINDMILL:
soundID = soundBase::GENIE;
onEmpty.addTxt(MetaString::ADVOB_TXT, 169);
// 3-6 of any resource but wood and gold
for (int resID = Res::MERCURY; resID < Res::GOLD; resID++)
{
for (int val = 3; val <=6; val++)
{
CVisitInfo visit;
visit.reward.resources[resID] = val;
visit.message.addTxt(MetaString::ADVOB_TXT, 92);
info.push_back(visit);
}
}
info[0].message.addTxt(MetaString::ADVOB_TXT, 92);
break;
case Obj::WATER_WHEEL:
soundID = soundBase::GENIE;
onEmpty.addTxt(MetaString::ADVOB_TXT, 165);
info.resize(1);
info[0].reward.resources[Res::GOLD] = 500;
info[0].message.addTxt(MetaString::ADVOB_TXT, 164);
break;
}
@ -1084,19 +1068,59 @@ void CGVisitableOPW::initObj(CRandomGenerator & rand)
void CGVisitableOPW::setPropertyDer(ui8 what, ui32 val)
{
if(ID == Obj::WATER_WHEEL && what == ObjProperty::REWARD_RESET)
if(what == ObjProperty::REWARD_RESET)
{
auto& reward = info[0].reward.resources[Res::GOLD];
if(info[0].numOfGrants == 0)
setRandomReward(cb->gameState()->getRandomGenerator());
if (ID == Obj::WATER_WHEEL)
{
reward = 1000;
auto& reward = info[0].reward.resources[Res::GOLD];
if(info[0].numOfGrants == 0)
{
reward = 1000;
}
else
{
reward = 500;
}
}
ChangeObjectVisitors cov(ChangeObjectVisitors::VISITOR_CLEAR, id);
cb->sendAndApply(&cov); // that cause server hang
}
CRewardableObject::setPropertyDer(what, val);
}
void CGVisitableOPW::setRandomReward(CRandomGenerator &rand)
{
switch (ID)
{
case Obj::MYSTICAL_GARDEN:
info.resize(1);
if (rand.nextInt(1) == 0)
{
info[0].reward.resources[Res::GEMS] = 5;
info[0].limiter.numOfGrants = 1;
}
else
{
reward = 500;
info[0].reward.resources[Res::GOLD] = 500;
info[0].limiter.numOfGrants = 1;
}
break;
case Obj::WINDMILL:
info.resize(1);
// 3-6 of any resource but wood and gold
info[0].reward.resources[rand.nextInt(Res::MERCURY, Res::GEMS)] = rand.nextInt(3, 6);
info[0].limiter.numOfGrants = 1;
break;
case Obj::WATER_WHEEL:
info.resize(1);
info[0].reward.resources[Res::GOLD] = 500;
info[0].limiter.numOfGrants = 1;
break;
}
CRewardableObject::setPropertyDer(what, val);
}
///////////////////////////////////////////////////////////////////////////////////////////////////

1
lib/mapObjects/CRewardableObject.h
View File

@ -321,6 +321,7 @@ public:
CGVisitableOPW();
void setPropertyDer(ui8 what, ui32 val) override;
void setRandomReward(CRandomGenerator & rand);
template <typename Handler> void serialize(Handler &h, const int version)
{