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

Unified income handling, added IOwnableObject interface

Browse Source
This commit is contained in:
Ivan Savenko
2024-08-24 20:42:19 +00:00
parent 189cb1c762
commit 0fd9dbf240
20 changed files with 116 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/mapObjects/MiscObjects.cpp
View File

@ -93,18 +93,6 @@ void CGMine::onHeroVisit( const CGHeroInstance * h ) const
}
flagMine(h->tempOwner);
}
void CGMine::newTurn(vstd::RNG & rand) const
{
if(cb->getDate() == 1)
return;
if (tempOwner == PlayerColor::NEUTRAL)
return;
cb->giveResource(tempOwner, producedResource, getProducedQuantity());
}
void CGMine::initObj(vstd::RNG & rand)
@ -139,11 +127,19 @@ bool CGMine::isAbandoned() const
return subID.getNum() >= 7;
}
const IOwnableObject * CGMine::asOwnable() const
{
return this;
}
ResourceSet CGMine::dailyIncome() const
{
ResourceSet result;
result[producedResource] += defaultResProduction();
const auto & playerSettings = cb->getPlayerSettings(getOwner());
result.applyHandicap(playerSettings->handicap.percentIncome);
return result;
}