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

Rumors: move code into CGameState and add backward compatability

Browse Source
This commit is contained in:
ArseniyShestakov
2015-12-01 00:44:58 +03:00
parent 879eaa47f8
commit 98582d628c
5 changed files with 111 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
lib/CGameState.cpp
View File

@@ -2133,6 +2133,75 @@ int3 CGameState::guardingCreaturePosition (int3 pos) const
return gs->map->guardingCreaturePositions[pos.x][pos.y][pos.z];
}
void CGameState::updateRumor()
{
static std::vector<RumorState::ERumorType> rumorTypes = {RumorState::RUMOR_MAP, RumorState::RUMOR_STATS, RumorState::RUMOR_RAND, RumorState::RUMOR_RAND};
static std::vector<int> statsRumorTypes = {208, 209, 210};// 211, 212};
int rumorId = -1;
int rumorPlayer = PlayerColor::CANNOT_DETERMINE.getNum();
auto & rand = gs->getRandomGenerator();
rumor.type = *RandomGeneratorUtil::nextItem(rumorTypes, rand);
if(!gs->map->rumors.size() && rumor.type == RumorState::RUMOR_MAP)
rumor.type = RumorState::RUMOR_RAND;
switch(rumor.type)
{
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 210:
players = tgi.army[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();
break;
}
case RumorState::RUMOR_MAP:
rumorId = rand.nextInt(gs->map->rumors.size() - 1);
break;
case RumorState::RUMOR_RAND:
do
{
rumorId = rand.nextInt(VLC->generaltexth->tavernRumors.size() - 1);
}
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);
}
bool CGameState::isVisible(int3 pos, PlayerColor player)
{
if(player == PlayerColor::NEUTRAL)