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

Spell shrines can now be configured in json

Browse Source
This commit is contained in:
Ivan Savenko
2023-06-06 18:34:04 +03:00
parent 5cfbdd2967
commit fc190b14bb
14 changed files with 168 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/IGameCallback.cpp
View File

@@ -170,16 +170,19 @@ void CPrivilegedInfoCallback::pickAllowedArtsSet(std::vector<const CArtifact *>
out.push_back(VLC->arth->objects[VLC->arth->pickRandomArtifact(rand, CArtifact::ART_MAJOR)]);
}
void CPrivilegedInfoCallback::getAllowedSpells(std::vector<SpellID> & out, ui16 level)
void CPrivilegedInfoCallback::getAllowedSpells(std::vector<SpellID> & out, std::optional<ui16> level)
{
for (ui32 i = 0; i < gs->map->allowedSpell.size(); i++) //spellh size appears to be greater (?)
{
const spells::Spell * spell = SpellID(i).toSpell();
if(isAllowed(0, spell->getIndex()) && spell->getLevel() == level)
{
out.push_back(spell->getId());
}
if (!isAllowed(0, spell->getIndex()))
continue;
if (level.has_value() && spell->getLevel() != level)
continue;
out.push_back(spell->getId());
}
}