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

Rumors: implement income checking via statsHLP::getIncome

Browse Source 
This also fix income ranking in Thieves' Guild
This commit is contained in:
ArseniyShestakov 2015-12-01 06:28:08 +03:00
parent ffcc5ccdd2
commit a62ee65d72
1 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
lib/CGameState.cpp
View File

@ -2136,7 +2136,7 @@ int3 CGameState::guardingCreaturePosition (int3 pos) const
void CGameState::updateRumor() void CGameState::updateRumor()
{ {
static std::vector<RumorState::ERumorType> rumorTypes = {RumorState::RUMOR_MAP, RumorState::RUMOR_STATS, RumorState::RUMOR_RAND, RumorState::RUMOR_RAND}; 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, 212};// 211}; static std::vector<int> statsRumorTypes = {208, 209, 210, 211, 212};
int rumorId = -1, rumorExtra = -1; int rumorId = -1, rumorExtra = -1;
auto & rand = gs->getRandomGenerator(); auto & rand = gs->getRandomGenerator();
@ -2175,7 +2175,6 @@ void CGameState::updateRumor()
break; break;
case 211: case 211:
/// TODO: not implemented in obtainPlayersStats
players = tgi.income[0]; players = tgi.income[0];
break; break;
} }
@ -2522,6 +2521,58 @@ struct statsHLP
} }
return str; return str;
} }
// get total gold income
static int getIncome(const PlayerState * ps)
{
int totalIncome = 0;
const CGObjectInstance * heroOrTown = nullptr;
//Heroes can produce gold as well - skill, specialty or arts
for(auto & h : ps->heroes)
{
totalIncome += h->valOfBonuses(Selector::typeSubtype(Bonus::SECONDARY_SKILL_PREMY, SecondarySkill::ESTATES));
totalIncome += h->valOfBonuses(Selector::typeSubtype(Bonus::GENERATE_RESOURCE, Res::GOLD));
if(!heroOrTown)
heroOrTown = h;
}
//Add town income of all towns
for(auto & t : ps->towns)
{
totalIncome += t->dailyIncome()[Res::GOLD];
if(!heroOrTown)
heroOrTown = t;
}
/// FIXME: Dirty dirty hack
/// Stats helper need some access to gamestate.
std::vector<const CGObjectInstance *> ownedObjects;
for(const CGObjectInstance * obj : heroOrTown->cb->gameState()->map->objects)
{
if(obj && obj->tempOwner == ps->color)
ownedObjects.push_back(obj);
}
/// This is code from CPlayerSpecificInfoCallback::getMyObjects
/// I'm really need to find out about callback interface design...
for(auto object : ownedObjects)
{
//Mines
if ( object->ID == Obj::MINE )
{
const CGMine *mine = dynamic_cast<const CGMine*>(object);
assert(mine);
if (mine->producedResource == Res::GOLD)
totalIncome += mine->producedQuantity;
}
}
return totalIncome;
}
}; };
void CGameState::obtainPlayersStats(SThievesGuildInfo & tgi, int level) void CGameState::obtainPlayersStats(SThievesGuildInfo & tgi, int level)
@ -2596,7 +2647,7 @@ void CGameState::obtainPlayersStats(SThievesGuildInfo & tgi, int level)
} }
if(level >= 7) //income if(level >= 7) //income
{ {
//TODO:obtainPlayersStats - income FILL_FIELD(income, statsHLP::getIncome(&g->second))
} }
if(level >= 8) //best hero's stats if(level >= 8) //best hero's stats
{ {