games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Feature: Lodestar Grail should work.

Browse Source
This commit is contained in:
Dmitry Orlov
2020-12-10 04:05:37 +03:00
parent eb011e59c4
commit 8f331dce31
14 changed files with 77 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/CCreatureHandler.cpp
View File

@@ -135,9 +135,19 @@ std::string CCreature::nodeName() const
return "\"" + namePl + "\"";
}
bool CCreature::isItNativeTerrain(int terrain) const
bool CCreature::isItNativeTerrain(ETerrainType::EETerrainType terrain) const
{
return VLC->townh->factions[faction]->nativeTerrain == terrain;
auto native = getNativeTerrain();
return native == terrain || native == ETerrainType::ANY_TERRAIN;
}
ETerrainType::EETerrainType CCreature::getNativeTerrain() const
{
//this code is used in the CreatureTerrainLimiter::limit to setup battle bonuses
//and in the CGHeroInstance::getNativeTerrain() to setup mevement bonuses or/and penalties.
return hasBonusOfType(Bonus::NO_TERRAIN_PENALTY) ?
ETerrainType::ANY_TERRAIN
: (ETerrainType::EETerrainType)VLC->townh->factions[faction]->nativeTerrain;
}
void CCreature::setId(CreatureID ID)
@@ -210,10 +220,11 @@ CCreatureHandler::CCreatureHandler()
VLC->creh = this;
allCreatures.setDescription("All creatures");
allCreatures.setNodeType(CBonusSystemNode::ENodeTypes::ALL_CREATURES);
creaturesOfLevel[0].setDescription("Creatures of unnormalized tier");
for(int i = 1; i < ARRAY_COUNT(creaturesOfLevel); i++)
creaturesOfLevel[i].setDescription("Creatures of tier " + boost::lexical_cast<std::string>(i));
loadCommanders();
}
@@ -1194,6 +1205,11 @@ void CCreatureHandler::addBonusForAllCreatures(std::shared_ptr<Bonus> b)
allCreatures.addNewBonus(b);
}
void CCreatureHandler::removeBonusesFromAllCreatures()
{
allCreatures.removeBonuses(Selector::all);
}
void CCreatureHandler::buildBonusTreeForTiers()
{
for(CCreature *c : creatures)