games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-05-31 22:59:54 +02:00
Code Issues Releases Activity

Allow learning banned spell from Scholars (H3 logic)

Browse Source
This commit is contained in:
Ivan Savenko 2023-10-18 17:38:40 +03:00
parent ce480c8c84
commit 8f33fdcd83
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapObjects/CGHeroInstance.cpp
View File

@ -770,7 +770,7 @@ bool CGHeroInstance::canCastThisSpell(const spells::Spell * spell) const
} }
} }
bool CGHeroInstance::canLearnSpell(const spells::Spell * spell) const bool CGHeroInstance::canLearnSpell(const spells::Spell * spell, bool allowBanned) const
{ {
if(!hasSpellbook()) if(!hasSpellbook())
return false; return false;
@ -793,7 +793,7 @@ bool CGHeroInstance::canLearnSpell(const spells::Spell * spell) const
return false;//creature abilities can not be learned return false;//creature abilities can not be learned
} }
if(!IObjectInterface::cb->isAllowed(0, spell->getIndex())) if(!allowBanned && !IObjectInterface::cb->isAllowed(0, spell->getIndex()))
{ {
logGlobal->warn("Hero %s try to learn banned spell %s", nodeName(), spell->getNameTranslated()); logGlobal->warn("Hero %s try to learn banned spell %s", nodeName(), spell->getNameTranslated());
return false;//banned spells should not be learned return false;//banned spells should not be learned

2
lib/mapObjects/CGHeroInstance.h
View File

@ -172,7 +172,7 @@ public:
int getCurrentLuck(int stack=-1, bool town=false) const; int getCurrentLuck(int stack=-1, bool town=false) const;
int32_t getSpellCost(const spells::Spell * sp) const; //do not use during battles -> bonuses from army would be ignored int32_t getSpellCost(const spells::Spell * sp) const; //do not use during battles -> bonuses from army would be ignored
bool canLearnSpell(const spells::Spell * spell) const; bool canLearnSpell(const spells::Spell * spell, bool allowBanned = false) const;
bool canCastThisSpell(const spells::Spell * spell) const; //determines if this hero can cast given spell; takes into account existing spell in spellbook, existing spellbook and artifact bonuses bool canCastThisSpell(const spells::Spell * spell) const; //determines if this hero can cast given spell; takes into account existing spell in spellbook, existing spellbook and artifact bonuses
/// convert given position between map position (CGObjectInstance::pos) and visitable position used for hero interactions /// convert given position between map position (CGObjectInstance::pos) and visitable position used for hero interactions

2
lib/rewardable/Limiter.cpp
View File

@ -127,7 +127,7 @@ bool Rewardable::Limiter::heroAllowed(const CGHeroInstance * hero) const
for(const auto & spell : canLearnSpells) for(const auto & spell : canLearnSpells)
{ {
if (!hero->canLearnSpell(spell.toSpell(VLC->spells()))) if (!hero->canLearnSpell(spell.toSpell(VLC->spells()), true))
return false; return false;
} }