0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add exclude_amla key to disable an advancement if other advancements are already present

Browse source
This commit is contained in:
Celtic Minstrel 2015-08-14 15:33:33 -04:00
parent 7a5ba33f5a
commit 78fd51ffab
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/unit.cpp
View file

@ -1579,14 +1579,30 @@ std::vector<config> unit::get_modification_advances() const
continue;
std::vector<std::string> temp = utils::split(adv["require_amla"]);
if (temp.empty()) {
std::vector<std::string> temp2 = utils::split(adv["exclude_amla"]);
if (temp.empty() && temp2.empty()) {
res.push_back(adv);
continue;
}
std::sort(temp.begin(), temp.end());
std::vector<std::string> uniq;
std::sort(temp2.begin(), temp2.end());
std::vector<std::string> uniq, uniq2;
std::unique_copy(temp.begin(), temp.end(), std::back_inserter(uniq));
std::unique_copy(temp2.begin(), temp2.end(), std::back_inserter(uniq2));
bool exclusion_found = false;
BOOST_FOREACH(const std::string &s, uniq2)
{
int mod_num = modification_count("advancement", s);
if (mod_num > 0) {
exclusion_found = true;
break;
}
}
if (exclusion_found) {
continue;
}
bool requirements_done = true;
BOOST_FOREACH(const std::string &s, uniq)
@ -1598,8 +1614,9 @@ std::vector<config> unit::get_modification_advances() const
break;
}
}
if (requirements_done)
if (requirements_done) {
res.push_back(adv);
}
}
return res;