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

Rumors: avoid repeating of same rumor twice in a row

Browse Source 
Multiple rumors of same type can go in a row, but not identical rumors.
This commit is contained in:
ArseniyShestakov 2015-12-01 02:14:11 +03:00
parent 98582d628c
commit 15273ac0f7
3 changed files with 62 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CGameInfoCallback.cpp
View File

@ -575,7 +575,7 @@ std::string CGameInfoCallback::getTavernRumor(const CGObjectInstance * townOrTav
switch(gs->rumor.type)
{
case RumorState::RUMOR_STATS:
text = boost::str(boost::format(VLC->generaltexth->allTexts[rumor.first]) % VLC->generaltexth->colors[rumor.second]);
text = boost::str(boost::format(VLC->generaltexth->allTexts[rumor.first]) % VLC->generaltexth->capColors[rumor.second]);
break;
case RumorState::RUMOR_MAP:

101
lib/CGameState.cpp
View File

@ -2145,61 +2145,59 @@ void CGameState::updateRumor()
if(!gs->map->rumors.size() && rumor.type == RumorState::RUMOR_MAP)
rumor.type = RumorState::RUMOR_RAND;
switch(rumor.type)
do
{
case RumorState::RUMOR_STATS:
{
SThievesGuildInfo tgi;
gs->obtainPlayersStats(tgi, 20);
std::vector<PlayerColor> players = {};
rumorId = *RandomGeneratorUtil::nextItem(statsRumorTypes, rand);
switch(rumorId)
switch(rumor.type)
{
case 208:
players = tgi.obelisks[0];
break;
case RumorState::RUMOR_STATS:
{
SThievesGuildInfo tgi;
gs->obtainPlayersStats(tgi, 20);
std::vector<PlayerColor> players = {};
rumorId = *RandomGeneratorUtil::nextItem(statsRumorTypes, rand);
switch(rumorId)
{
case 208:
players = tgi.obelisks[0];
break;
case 209:
players = tgi.artifacts[0];
break;
case 209:
players = tgi.artifacts[0];
break;
case 210:
players = tgi.army[0];
break;
case 210:
players = tgi.army[0];
break;
case 211:
/// TODO: not implemented in obtainPlayersStats
players = tgi.income[0];
break;
case 211:
/// TODO: not implemented in obtainPlayersStats
players = tgi.income[0];
break;
case 212:
/// TODO: Check that ultimate artifact (grail) found
break;
}
rumorPlayer = RandomGeneratorUtil::nextItem(players, rand)->getNum();
case 212:
/// TODO: Check that ultimate artifact (grail) found
break;
}
rumorPlayer = RandomGeneratorUtil::nextItem(players, rand)->getNum();
case RumorState::RUMOR_MAP:
rumorId = rand.nextInt(gs->map->rumors.size() - 1);
break;
}
case RumorState::RUMOR_MAP:
rumorId = rand.nextInt(gs->map->rumors.size() - 1);
break;
break;
case RumorState::RUMOR_RAND:
do
{
rumorId = rand.nextInt(VLC->generaltexth->tavernRumors.size() - 1);
}
while(!VLC->generaltexth->tavernRumors[rumorId].length());
case RumorState::RUMOR_RAND:
do
{
rumorId = rand.nextInt(VLC->generaltexth->tavernRumors.size() - 1);
break;
}
while(!VLC->generaltexth->tavernRumors[rumorId].length());
break;
}
if(vstd::contains(rumor.last, rumor.type))
{
rumor.last.erase(rumor.type);
}
rumor.last[rumor.type] = std::make_pair(rumorId, rumorPlayer);
while(!rumor.update(rumorId, rumorPlayer));
}
bool CGameState::isVisible(int3 pos, PlayerColor player)
@ -2868,6 +2866,25 @@ std::string PlayerState::nodeName() const
return "Player " + (color.getNum() < VLC->generaltexth->capColors.size() ? VLC->generaltexth->capColors[color.getNum()] : boost::lexical_cast<std::string>(color));
}
bool RumorState::update(int id, int player)
{
if(vstd::contains(last, type))
{
if(last[type].first != id)
{
last[type].first = id;
last[type].second = player;
}
else
return false;
}
else
last[type] = std::make_pair(id, player);
return true;
}
InfoAboutArmy::InfoAboutArmy():
owner(PlayerColor::NEUTRAL)
{}

3
lib/CGameState.h
View File

@ -219,6 +219,7 @@ struct DLL_LINKAGE RumorState
std::map<ERumorType, std::pair<int, int>> last;
RumorState(){type = RUMOR_NONE; last = {};};
bool update(int id, int player);
template <typename Handler> void serialize(Handler &h, const int version)
{
@ -371,7 +372,7 @@ public:
{
h & rumor;
}
else
else if(!h.saving)
rumor = RumorState();
BONUS_TREE_DESERIALIZATION_FIX