Skip to content

Commit 4c25247

Browse files
committed
Relax item level requirements
Now if ilvl > max level then it use last level available.
1 parent 8f9f926 commit 4c25247

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

src/Battlescape/BattlescapeGenerator.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -947,11 +947,13 @@ void BattlescapeGenerator::deployAliens(AlienDeployment *deployment)
947947
}
948948
else
949949
{
950+
if ((*d).itemSets.size() == 0)
951+
{
952+
throw Exception("Unit generator encountered an error: item set not defined");
953+
}
950954
if (itemLevel >= (*d).itemSets.size())
951955
{
952-
std::stringstream ss;
953-
ss << "Unit generator encountered an error: not enough item sets defined, expected: " << itemLevel + 1 << " found: " << (*d).itemSets.size();
954-
throw Exception(ss.str());
956+
itemLevel = (*d).itemSets.size() - 1;
955957
}
956958
for (std::vector<std::string>::iterator it = (*d).itemSets.at(itemLevel).items.begin(); it != (*d).itemSets.at(itemLevel).items.end(); ++it)
957959
{

0 commit comments

Comments
 (0)