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

Improve pandora box secondary skill handling

Browse Source
This commit is contained in:
Dydzio
2016-09-20 12:40:58 +02:00
committed by GitHub
parent 563a5d53c0
commit bd651ec5ef
1 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lib/mapObjects/CGPandoraBox.cpp
View File

@@ -65,32 +65,32 @@ void CGPandoraBox::giveContentsUpToExp(const CGHeroInstance *h) const
break; break;
} }
} }
std::vector<std::pair<SecondarySkill, ui8>> unpossessedAbilities; //ability + ability level
int abilitiesRequiringSlot = 0;
if(gainedExp || changesPrimSkill || abilities.size()) //filter out unnecessary secondary skills
for (int i = 0; i < abilities.size(); i++)
{ {
std::vector<SecondarySkill> unpossessedAbilities; int curLev = h->getSecSkillLevel(abilities[i]);
std::vector<int> unpossessedAbilityLevels; bool abilityCanUseSlot = !curLev && ((h->secSkills.size() + abilitiesRequiringSlot) < GameConstants::SKILL_PER_HERO); //limit new abilities to number of slots
int abilitiesRequiringSlot = 0;
//filter out unnecessary secondary skills if (abilityCanUseSlot)
for (int i = 0; i < abilities.size(); i++) abilitiesRequiringSlot++;
if ((curLev && curLev < abilityLevels[i]) || abilityCanUseSlot)
{ {
int curLev = h->getSecSkillLevel(abilities[i]); unpossessedAbilities.push_back({ abilities[i], abilityLevels[i] });
bool abilityCanUseSlot = !curLev && ((h->secSkills.size() + abilitiesRequiringSlot) < GameConstants::SKILL_PER_HERO); //limit new abilities to number of slots
if (abilityCanUseSlot)
abilitiesRequiringSlot++;
if ( (curLev && curLev < abilityLevels[i]) || abilityCanUseSlot )
{
unpossessedAbilities.push_back(abilities[i]);
unpossessedAbilityLevels.push_back(abilityLevels[i]);
}
} }
}
if(gainedExp || changesPrimSkill || unpossessedAbilities.size())
{
TExpType expVal = h->calculateXp(gainedExp); TExpType expVal = h->calculateXp(gainedExp);
//getText(iw,afterBattle,175,h); //wtf? //getText(iw,afterBattle,175,h); //wtf?
iw.text.addTxt(MetaString::ADVOB_TXT, 175); //%s learns something
iw.text.addReplacement(h->name);
if(expVal) if(expVal)
iw.components.push_back(Component(Component::EXPERIENCE,0,expVal,0)); iw.components.push_back(Component(Component::EXPERIENCE,0,expVal,0));
@@ -98,19 +98,14 @@ void CGPandoraBox::giveContentsUpToExp(const CGHeroInstance *h) const
if(primskills[i]) if(primskills[i])
iw.components.push_back(Component(Component::PRIM_SKILL,i,primskills[i],0)); iw.components.push_back(Component(Component::PRIM_SKILL,i,primskills[i],0));
for(int i=0; i<unpossessedAbilities.size(); i++) for(auto abilityData : unpossessedAbilities)
iw.components.push_back(Component(Component::SEC_SKILL, unpossessedAbilities[i], unpossessedAbilityLevels[i],0)); iw.components.push_back(Component(Component::SEC_SKILL, abilityData.first, abilityData.second, 0));
if (iw.components.size() > 0) //TODO:Create information that box was empty for now, and deliver to CGPandoraBox::giveContentsAfterExp cb->showInfoDialog(&iw);
{
iw.text.addTxt(MetaString::ADVOB_TXT, 175); //%s learns something
iw.text.addReplacement(h->name);
cb->showInfoDialog(&iw);
}
//give sec skills //give sec skills
for (int i = 0; i<unpossessedAbilities.size(); i++) for (auto abilityData : unpossessedAbilities)
cb->changeSecSkill(h, unpossessedAbilities[i], unpossessedAbilityLevels[i],true); cb->changeSecSkill(h, abilityData.first, abilityData.second, true);
assert(h->secSkills.size() <= GameConstants::SKILL_PER_HERO); assert(h->secSkills.size() <= GameConstants::SKILL_PER_HERO);
@@ -125,6 +120,7 @@ void CGPandoraBox::giveContentsUpToExp(const CGHeroInstance *h) const
if(expVal) if(expVal)
cb->changePrimSkill(h, PrimarySkill::EXPERIENCE, expVal, false); cb->changePrimSkill(h, PrimarySkill::EXPERIENCE, expVal, false);
} }
//else { } //TODO:Create information that box was empty for now, and deliver to CGPandoraBox::giveContentsAfterExp or refactor
if(!cb->isVisitCoveredByAnotherQuery(this, h)) if(!cb->isVisitCoveredByAnotherQuery(this, h))
giveContentsAfterExp(h); giveContentsAfterExp(h);